Fixed caching of RPC clients