Impliment cache invalidation

Change-Id: If0389b3ccf38e3dbea513f837b86b20c2136337b