diff --git a/src/Orchard/Environment/WorkContextImplementation.cs b/src/Orchard/Environment/WorkContextImplementation.cs
index 7d98cf0cb..5356642e0 100644
--- a/src/Orchard/Environment/WorkContextImplementation.cs
+++ b/src/Orchard/Environment/WorkContextImplementation.cs
@@ -8,11 +8,11 @@ namespace Orchard.Environment {
     class WorkContextImplementation : WorkContext {
         readonly IComponentContext _componentContext;
         readonly ConcurrentDictionary<string, Func<object>> _stateResolvers = new ConcurrentDictionary<string, Func<object>>();
-        readonly IEnumerable<IWorkContextStateProvider> _workContextStateProviders;
+        readonly IEnumerable<Lazy<IWorkContextStateProvider>> _workContextStateProviders;
 
         public WorkContextImplementation(IComponentContext componentContext) {
             _componentContext = componentContext;
-            _workContextStateProviders = componentContext.Resolve<IEnumerable<IWorkContextStateProvider>>();
+            _workContextStateProviders = componentContext.Resolve<IEnumerable<Lazy<IWorkContextStateProvider>>>();
         }
 
         public override T Resolve<T>() {
@@ -29,7 +29,7 @@ namespace Orchard.Environment {
         }
 
         Func<object> FindResolverForState<T>(string name) {
-            var resolver = _workContextStateProviders.Select(wcsp => wcsp.Get<T>(name)).FirstOrDefault(value => !Equals(value, default(T)));
+            var resolver = _workContextStateProviders.Select(wcsp => wcsp.Value.Get<T>(name)).FirstOrDefault(value => !Equals(value, default(T)));
 
             if (resolver == null) {
                 return () => default(T);
@@ -42,4 +42,4 @@ namespace Orchard.Environment {
             _stateResolvers[name] = () => value;
         }
     }
-}
\ No newline at end of file
+}