Include string cache changes from @blackwhale