Added caching of generated data