ISPN-3290 Redesign CacheStore API

* migrated to the new API
ISPN-3290 Redesign CacheStore API

* renamed for consistency