Switch to Apache httpclient