Sanne Grinovero, Steve Ebersole, may be it possible to provide separate setting that will be manage CacheKeysFactory type, DefaultCacheKeysFactory or SimpleCacheKeysFactory? Do you think that MultiTenancyStrategy is unsuitable for this, don`t you? We do not use neither the DISCRIMINATOR nor the SCHEMA or DATABASE MultiTenancyStrategy but need to include entity type into cache key. Without this setting we have to patch each hibernate-infinispan.jar revision in Wildfly packages. Already patched 5.0.7.Final and 5.0.9.Final. 5.1.0.Final in turn.