Keep up with HttpClient's neverending API changes