Better invalidation

Change-Id: Ie31ad4c00059bf3f10e1fdf9d123821d64cbe3bf