Merge pull request #1161 from athre0z/caching-session-debug-impl

Merge pull request #1161 from athre0z/caching-session-debug-impl #3025