Caching mode added