Added support for session caching