Correct and enhance the behaviour of "internal" session caching as it