Improve performance: honor session support, avoid context lookup