Added caching support to client