Use request context, not session