Switch to using HttpClient