Wrapper that should handle API changes for Infinispan 6.0

Some stuff moved to infinispan-commons