Merge "Update HttpResponseCache to use the new cache API."