stop using custom flags for invalidation and just use what _Invalidating is providing me