bf-7 added check for httpContext != null when adding provider data as it can be used on another thread than the request