Take invalidation into account