Try caching the client too