CAUSEWAY-3975: make shared state more explicit
11 files changed