NXP-13315 improve invalidations