Merge "First pass at updated cache clearing logic." am: 45270e18cc am: fe40750da2
am: 19c96b49b5

Change-Id: Ide4a9e17f76b3f136c2f13b0558a6130865226f4