better mcp support - should fix hanging when streamable http server is added