[WIP][2] Client / HttpClient decoupling for Guzzle integration