replaced GetContextPerRequest with Current