Hazelcast cache fixes