Merge pull request #14423 from totten/master-cache-test