Client cache refactoring.