Undo overzealous replacement of Session with UserCache