Properly extend caching client, added test for caching