Merge "Delay language conversion cache construction until needed"