Merge "Revert "Fix concurrency issue in PropertyInvalidatedCache""