Add caching on the front-end