Merge pull request #17916 from colemanw/domainCache