Add client handler and cacheTest