Cleaned up session-level caching