Add caching capability