cache manager fix and refactor CacheProxy