Reworked cart invalidation