Lots of updates for new scheme in session cache.