OGM-677 Rename CacheStorage for EhCache and Infinispan to CacheMapping