We decided to use Infinispan 8, and rather than use the AtomicMap approach to rely on protobuf and the query capabilities it provides.