Better invalidation

Change-Id: I95f73371052248e62d8ffae4989eb461eecb510e