Merge "Revert "[LanguageConverter] Added some cache code based on the problems in...