Merge "Update associated with ResponseCache removal"