Merge pull request #90474 from j-hui/cache-frts