Merge "Use UTF-8 strings to avoid duplicate caching, part 1"