Merge "Revert "Cache all Charset instances with their aliases""