Move layout/caching in text rather than font.