I'm opening this to make sure we keep Infinispan aligned with the other platforms, now moving to Hibernate 5.

This affects at least the JPA CacheStore, I'm not sure if other components.

Among many improvements, noticeable for Infinispan there is better OSGi support.