Merge "Fix concurrency issue in PropertyInvalidatedCache" into tm-qpr-dev