Added support for caching data