Migrate WS Proxy to async