Clearer approach to invalidation.