Added support for new Caching functionality