Final fix of caching data in ProxyManager (hopefully)