Replace WebClient with HttpClient