Update and improve caching to word cloud