Change HttpClient class to non-singleton pattern