ISPN-3290 Redesign CacheStore API

* fixed test timing out due to marshaller being created on every request