Refactoring to independent HTTP client provider