ISPN-3478 Polish CS API revamp

* update server with the new cache store API changes