can we do the same for ProxyStore? Seems like that will will probably be broken too, right?