Fix minor regression in default cache logic since Infinispan 6.0 upgrade.
Merge pull request #5165 from pferraro/infinispan

Fix minor regression in default cache logic since Infinispan 6.0 upgrade