We would need to remove VersionAwareMarshaller.cacheName/getCacheName first. I don't see its purpose. And remove the Cache from VersionAwareMarshaller.inject(..).