Merge "Improve TextLayoutCache performances a bit"