diff --git a/src/Orchard.Core.Tests/Body/BodyPartTests.cs b/src/Orchard.Core.Tests/Body/BodyPartTests.cs
index a899d8246..17fa1bbf4 100644
--- a/src/Orchard.Core.Tests/Body/BodyPartTests.cs
+++ b/src/Orchard.Core.Tests/Body/BodyPartTests.cs
@@ -38,6 +38,7 @@ namespace Orchard.Core.Tests.Body {
             builder.RegisterType<OrchardServices>().As<IOrchardServices>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
 
             builder.RegisterType<ThingHandler>().As<IContentHandler>();
 
diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs
index a963c2f66..408595d28 100644
--- a/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs
+++ b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs
@@ -66,6 +66,7 @@ namespace Orchard.Core.Tests.Common.Providers {
 
             builder.RegisterInstance(new RequestContext(new StubHttpContext(), new RouteData()));
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
 
diff --git a/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs b/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs
index 084ec8512..693c99c0f 100644
--- a/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs
+++ b/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs
@@ -54,6 +54,7 @@ namespace Orchard.Core.Tests.Routable.Services {
             builder.RegisterType<RoutableService>().As<IRoutableService>();
             builder.RegisterType<RoutablePathConstraint>().As<IRoutablePathConstraint>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
 
             builder.RegisterType<DefaultContentQuery>().As<IContentQuery>();
diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs
index 1dae6ce97..138fd6384 100644
--- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs
+++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs
@@ -36,6 +36,7 @@ namespace Orchard.Core.Tests.Scheduling {
             builder.RegisterType<DefaultContentManager>().As<IContentManager>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);
diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
index 577fab442..5986d8248 100644
--- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
+++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
@@ -40,6 +40,7 @@ namespace Orchard.Core.Tests.Scheduling {
             builder.RegisterType<DefaultContentManager>().As<IContentManager>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);
diff --git a/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs b/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs
index 6d9dddc3d..d1b3cf64c 100644
--- a/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs
+++ b/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs
@@ -70,6 +70,7 @@ namespace Orchard.Tests.Modules.Users.Controllers {
             builder.RegisterType<TransactionManager>().As<ITransactionManager>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
             builder.RegisterType<SiteSettingsPartHandler>().As<IContentHandler>();
             builder.RegisterType<RegistrationSettingsPartHandler>().As<IContentHandler>();
diff --git a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
index cc6d6c553..e34f7f8f4 100644
--- a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
+++ b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
@@ -56,6 +56,7 @@ namespace Orchard.Tests.ContentManagement {
             builder.RegisterType<FlavoredPartHandler>().As<IContentHandler>();
             builder.RegisterType<StyledHandler>().As<IContentHandler>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
 
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
diff --git a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs
index 2f6f706fc..e583f5004 100644
--- a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs
+++ b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs
@@ -68,6 +68,7 @@ namespace Orchard.Tests.ContentManagement {
             builder.RegisterType<FlavoredPartHandler>().As<IContentHandler>();
             builder.RegisterType<StyledHandler>().As<IContentHandler>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
 
diff --git a/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs b/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
index c3d2099ba..0dbede940 100644
--- a/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
@@ -27,6 +27,7 @@ namespace Orchard.Tests.DisplayManagement {
 
             builder.RegisterType<DefaultDisplayManager>().As<IDisplayManager>();
             builder.RegisterType<TestShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<TestWorkContextAccessor>().As<IWorkContextAccessor>();
             builder.RegisterType<TestDisplayEvents>().As<IShapeDisplayEvents>()
                 .As<TestDisplayEvents>()
diff --git a/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs b/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs
index ffd4ca289..7ee8a5964 100644
--- a/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs
@@ -10,7 +10,7 @@ using Orchard.Tests.Stubs;
 
 namespace Orchard.Tests.DisplayManagement {
     [TestFixture]
-    public class DefaultShapeBuilderTests {
+    public class ShapeFactoryTests {
         private IContainer _container;
 
         [SetUp]
@@ -18,6 +18,7 @@ namespace Orchard.Tests.DisplayManagement {
             var builder = new ContainerBuilder();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
             builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<StubParallelCacheContext>().As<IParallelCacheContext>();
diff --git a/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs b/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs
index 36ab18689..0d7ec85d0 100644
--- a/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs
@@ -17,6 +17,7 @@ namespace Orchard.Tests.DisplayManagement {
             var builder = new ContainerBuilder();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
             builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<StubParallelCacheContext>().As<IParallelCacheContext>();
diff --git a/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs b/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs
index f57ba0c73..473a825b6 100644
--- a/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs
@@ -43,6 +43,7 @@ namespace Orchard.Tests.DisplayManagement {
             var builder = new ContainerBuilder();
             builder.RegisterModule(new ShapeAttributeBindingModule());
             builder.RegisterType<ShapeAttributeBindingStrategy>().As<IShapeTableProvider>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
             builder.RegisterType<DefaultDisplayManager>().As<IDisplayManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<DisplayHelperFactory>().As<IDisplayHelperFactory>();
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
index 50ddb32f6..f4653e94b 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
@@ -84,6 +84,7 @@ namespace Orchard.Setup {
             builder.RegisterType<DefaultDisplayManager>().As<IDisplayManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
 
             builder.RegisterType<ThemeAwareViewEngine>().As<IThemeAwareViewEngine>();
             builder.RegisterType<LayoutAwareViewEngine>().As<ILayoutAwareViewEngine>();
diff --git a/src/Orchard/ContentManagement/DefaultContentDisplay.cs b/src/Orchard/ContentManagement/DefaultContentDisplay.cs
index dccd0c448..ea5448980 100644
--- a/src/Orchard/ContentManagement/DefaultContentDisplay.cs
+++ b/src/Orchard/ContentManagement/DefaultContentDisplay.cs
@@ -8,32 +8,32 @@ using Orchard.DisplayManagement;
 using Orchard.DisplayManagement.Descriptors;
 using Orchard.FileSystems.VirtualPath;
 using Orchard.Logging;
-using Orchard.Themes;
 using Orchard.UI.Zones;
 
 namespace Orchard.ContentManagement {
     public class DefaultContentDisplay : IContentDisplay {
         private readonly Lazy<IEnumerable<IContentHandler>> _handlers;
         private readonly IShapeFactory _shapeFactory;
-        private readonly IShapeTableManager _shapeTableManager;
-        private readonly Lazy<IThemeManager> _themeService;
+        private readonly Lazy<IShapeTableLocator> _shapeTableLocator; 
+
         private readonly RequestContext _requestContext;
         private readonly IVirtualPathProvider _virtualPathProvider;
+        private readonly IWorkContextAccessor _workContextAccessor;
 
         public DefaultContentDisplay(
             Lazy<IEnumerable<IContentHandler>> handlers,
             IShapeFactory shapeFactory,
-            IShapeTableManager shapeTableManager,
-            Lazy<IThemeManager> themeService,
+            Lazy<IShapeTableLocator> shapeTableLocator, 
             RequestContext requestContext,
-            IVirtualPathProvider virtualPathProvider) {
+            IVirtualPathProvider virtualPathProvider,
+            IWorkContextAccessor workContextAccessor) {
 
             _handlers = handlers;
             _shapeFactory = shapeFactory;
-            _shapeTableManager = shapeTableManager;
-            _themeService = themeService;
+            _shapeTableLocator = shapeTableLocator;
             _requestContext = requestContext;
             _virtualPathProvider = virtualPathProvider;
+            _workContextAccessor = workContextAccessor;
 
             Logger = NullLogger.Instance;
         }
@@ -106,8 +106,11 @@ namespace Orchard.ContentManagement {
         private void BindPlacement(BuildShapeContext context, string displayType, string stereotype) {
             context.FindPlacement = (partShapeType, differentiator, defaultLocation) => {
 
-                var theme = _themeService.Value.GetRequestTheme(_requestContext);
-                var shapeTable = _shapeTableManager.GetShapeTable(theme.Id);
+                var workContext = _workContextAccessor.GetContext(_requestContext.HttpContext);
+
+                var theme = workContext.CurrentTheme;
+                var shapeTable = _shapeTableLocator.Value.Lookup(theme.Id);
+
                 var request = _requestContext.HttpContext.Request;
 
                 ShapeDescriptor descriptor;
diff --git a/src/Orchard/ContentManagement/DefaultContentManager.cs b/src/Orchard/ContentManagement/DefaultContentManager.cs
index b1317c871..f7103d119 100644
--- a/src/Orchard/ContentManagement/DefaultContentManager.cs
+++ b/src/Orchard/ContentManagement/DefaultContentManager.cs
@@ -15,7 +15,6 @@ using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.ContentManagement.MetaData.Models;
 using Orchard.ContentManagement.Records;
 using Orchard.Data;
-using Orchard.Environment;
 using Orchard.Indexing;
 using Orchard.Logging;
 using Orchard.UI;
@@ -29,7 +28,7 @@ namespace Orchard.ContentManagement {
         private readonly IContentDefinitionManager _contentDefinitionManager;
         private readonly Func<IContentManagerSession> _contentManagerSession;
         private readonly Lazy<IContentDisplay> _contentDisplay;
-        private readonly Work<ISessionLocator> _sessionLocator; 
+        private readonly Lazy<ISessionLocator> _sessionLocator; 
         private const string Published = "Published";
         private const string Draft = "Draft";
 
@@ -41,7 +40,7 @@ namespace Orchard.ContentManagement {
             IContentDefinitionManager contentDefinitionManager,
             Func<IContentManagerSession> contentManagerSession,
             Lazy<IContentDisplay> contentDisplay,
-            Work<ISessionLocator> sessionLocator) {
+            Lazy<ISessionLocator> sessionLocator) {
             _context = context;
             _contentTypeRepository = contentTypeRepository;
             _contentItemRepository = contentItemRepository;
diff --git a/src/Orchard/DisplayManagement/Descriptors/ShapeTableLocator.cs b/src/Orchard/DisplayManagement/Descriptors/ShapeTableLocator.cs
new file mode 100644
index 000000000..6fc0de1c8
--- /dev/null
+++ b/src/Orchard/DisplayManagement/Descriptors/ShapeTableLocator.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Concurrent;
+
+namespace Orchard.DisplayManagement.Descriptors
+{
+
+    /// <summary>
+    /// Will return the same shape table per name within the same unit of work.
+    /// Reduces compute costs compared to IShapeTableManager.GetShapeTable.
+    /// </summary>
+    public interface IShapeTableLocator : IUnitOfWorkDependency
+    {
+        ShapeTable Lookup(string themeName);
+    }
+
+    public class ShapeTableLocator : IShapeTableLocator
+    {
+        private readonly IShapeTableManager _shapeTableManager;
+        readonly ConcurrentDictionary<string, ShapeTable> _shapeTables = new ConcurrentDictionary<string, ShapeTable>();
+
+        public ShapeTableLocator(IShapeTableManager shapeTableManager)
+        {
+            _shapeTableManager = shapeTableManager;
+        }
+
+        public ShapeTable Lookup(string themeName)
+        {
+            return _shapeTables.GetOrAdd(themeName ?? "", _ => _shapeTableManager.GetShapeTable(themeName));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard/DisplayManagement/Implementation/DefaultDisplayManager.cs b/src/Orchard/DisplayManagement/Implementation/DefaultDisplayManager.cs
index ef30ce852..5d00298dc 100644
--- a/src/Orchard/DisplayManagement/Implementation/DefaultDisplayManager.cs
+++ b/src/Orchard/DisplayManagement/Implementation/DefaultDisplayManager.cs
@@ -13,7 +13,7 @@ using Orchard.Logging;
 
 namespace Orchard.DisplayManagement.Implementation {
     public class DefaultDisplayManager : IDisplayManager {
-        private readonly IShapeTableManager _shapeTableManager;
+        private readonly Lazy<IShapeTableLocator> _shapeTableLocator;
         private readonly IWorkContextAccessor _workContextAccessor;
         private readonly IEnumerable<IShapeDisplayEvents> _shapeDisplayEvents;
 
@@ -26,10 +26,10 @@ namespace Orchard.DisplayManagement.Implementation {
                     null/*typeof(DefaultDisplayManager)*/)));
 
         public DefaultDisplayManager(
-            IShapeTableManager shapeTableManager,
             IWorkContextAccessor workContextAccessor,
-            IEnumerable<IShapeDisplayEvents> shapeDisplayEvents) {
-            _shapeTableManager = shapeTableManager;
+            IEnumerable<IShapeDisplayEvents> shapeDisplayEvents,
+            Lazy<IShapeTableLocator> shapeTableLocator) {
+            _shapeTableLocator = shapeTableLocator;
             _workContextAccessor = workContextAccessor;
             _shapeDisplayEvents = shapeDisplayEvents;
             T = NullLocalizer.Instance;
@@ -53,7 +53,7 @@ namespace Orchard.DisplayManagement.Implementation {
                 return CoerceHtmlString(context.Value);
 
             var workContext = _workContextAccessor.GetContext(context.ViewContext);
-            var shapeTable = _shapeTableManager.GetShapeTable(workContext.CurrentTheme.Id);
+            var shapeTable = _shapeTableLocator.Value.Lookup(workContext.CurrentTheme.Id);
 
             var displayingContext = new ShapeDisplayingContext {
                 Shape = shape,
diff --git a/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs b/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs
index a295bb240..2ba84fa50 100644
--- a/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs
+++ b/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs
@@ -9,13 +9,14 @@ namespace Orchard.DisplayManagement.Implementation {
 
     public class DefaultShapeFactory : Clay, IShapeFactory {
         private readonly IEnumerable<Lazy<IShapeFactoryEvents>> _events;
-        private readonly IShapeTableManager _shapeTableManager;
+        private readonly Lazy<IShapeTableLocator> _shapeTableLocator;
 
         public DefaultShapeFactory(
             IEnumerable<Lazy<IShapeFactoryEvents>> events,
-            IShapeTableManager shapeTableManager) : base(new ShapeFactoryBehavior()) {
+            Lazy<IShapeTableLocator> shapeTableLocator) : base(new ShapeFactoryBehavior())
+        {
             _events = events;
-            _shapeTableManager = shapeTableManager;
+            _shapeTableLocator = shapeTableLocator;
         }
         
         class ShapeFactoryBehavior : ClayBehavior {
@@ -29,7 +30,7 @@ namespace Orchard.DisplayManagement.Implementation {
         }
 
         public IShape Create(string shapeType, INamedEnumerable<object> parameters, IEnumerable<IClayBehavior> behaviors) {
-            var defaultShapeTable = _shapeTableManager.GetShapeTable(null);
+            var defaultShapeTable = _shapeTableLocator.Value.Lookup(null);
             ShapeDescriptor shapeDescriptor;
             defaultShapeTable.Descriptors.TryGetValue(shapeType, out shapeDescriptor);
 
diff --git a/src/Orchard/Themes/CurrentThemeWorkContext.cs b/src/Orchard/Themes/CurrentThemeWorkContext.cs
new file mode 100644
index 000000000..0f97ae681
--- /dev/null
+++ b/src/Orchard/Themes/CurrentThemeWorkContext.cs
@@ -0,0 +1,27 @@
+using System;
+using Orchard.Mvc;
+
+namespace Orchard.Themes
+{
+    public class CurrentThemeWorkContext : IWorkContextStateProvider
+    {
+        private readonly IThemeManager _themeManager;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public CurrentThemeWorkContext(IThemeManager themeManager, IHttpContextAccessor httpContextAccessor)
+        {
+            _themeManager = themeManager;
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public Func<WorkContext, T> Get<T>(string name)
+        {
+            if (name == "CurrentTheme")
+            {
+                var currentTheme = _themeManager.GetRequestTheme(_httpContextAccessor.Current().Request.RequestContext);
+                return ctx => (T)(object)currentTheme;
+            }
+            return null;
+        }
+    }
+}