Improve caching; remove TextTools