Update string-cache for real
Merge pull request #3392 from pcwalton/string-cache-race

Update string-cache for real