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

Change-Id: Icade9c982866bb45c63cc484b77820fb9c1b77ea