Actually cache the client this time