Add cache tests.  Fix up Client to work with refactored Cache. Add tests for Client with cache.