Improved session caching design