Added font caching