ISPN-3290 Redesign CacheStore API

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

* renamed to be inline with the other stores