Merge pull request #9294 from annando/tag-cache