Merge pull request #3376 from pcwalton/string-cache-race

build: Update string-cache to fix a nasty race
Update string-cache for real