Merge "Add a flag to fix the security exception in PropertyInvalidatedCache." into main