CacheProxy refactored, cleaned up, (review)