Is there a reason (other than ease of transition) that we are storing this in session at all?