Merge "Update the response cache on a conditional cache hit"