Merge "Revert "Refactor PropertyInvalidatedCache"" into main