diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs
index 8f1222e2b..4986cb536 100644
--- a/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs
+++ b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs
@@ -6,6 +6,7 @@ using Autofac;
 using JetBrains.Annotations;
 using Moq;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.ContentManagement.Aspects;
 using Orchard.ContentManagement.Drivers;
 using Orchard.ContentManagement.Drivers.Coordinators;
@@ -53,6 +54,7 @@ namespace Orchard.Core.Tests.Common.Providers {
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterInstance(new Mock<IThemeManager>().Object);
             builder.RegisterInstance(new Mock<IOrchardServices>().Object);
             builder.RegisterInstance(new Mock<RequestContext>().Object);
diff --git a/src/Orchard.Tests/DisplayManagement/Descriptors/DefaultShapeTableManagerTests.cs b/src/Orchard.Tests/DisplayManagement/Descriptors/DefaultShapeTableManagerTests.cs
index 5cdf6e35d..6c7bdc513 100644
--- a/src/Orchard.Tests/DisplayManagement/Descriptors/DefaultShapeTableManagerTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/Descriptors/DefaultShapeTableManagerTests.cs
@@ -3,18 +3,20 @@ using System.Collections.Generic;
 using System.Linq;
 using Autofac;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.ContentManagement;
 using Orchard.DisplayManagement.Descriptors;
 using Orchard.DisplayManagement.Implementation;
-using Orchard.Environment.Descriptor.Models;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Models;
+using Orchard.Tests.Stubs;
 
 namespace Orchard.Tests.DisplayManagement.Descriptors {
     [TestFixture]
     public class DefaultShapeTableManagerTests : ContainerTestBase {
-        protected override void Register(Autofac.ContainerBuilder builder) {
+        protected override void Register(ContainerBuilder builder) {
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
 
             var features = new [] {
                 new FeatureDescriptor {
diff --git a/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs b/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs
index d217198b8..bda26c966 100644
--- a/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Autofac;
+using Autofac;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.DisplayManagement;
 using Orchard.DisplayManagement.Descriptors;
 using Orchard.DisplayManagement.Implementation;
@@ -22,6 +19,7 @@ namespace Orchard.Tests.DisplayManagement {
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             _container = builder.Build();
         }
 
diff --git a/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs b/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs
index ce6b42307..953efdadf 100644
--- a/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Autofac;
+using Autofac;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.DisplayManagement;
 using Orchard.DisplayManagement.Descriptors;
 using Orchard.DisplayManagement.Implementation;
-using Orchard.DisplayManagement.Shapes;
 using Orchard.Environment.Extensions;
 using Orchard.Tests.Stubs;
 
@@ -22,6 +18,7 @@ namespace Orchard.Tests.DisplayManagement {
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             _container = builder.Build();
 
         }
diff --git a/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs b/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs
index 34e4b7a1b..e2e7eb30f 100644
--- a/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/SubsystemTests.cs
@@ -4,6 +4,7 @@ using System.Web.Routing;
 using Autofac;
 using Moq;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.DisplayManagement;
 using Orchard.DisplayManagement.Descriptors;
 using Orchard.DisplayManagement.Descriptors.ShapeAttributeStrategy;
@@ -11,6 +12,7 @@ using Orchard.DisplayManagement.Implementation;
 using Orchard.DisplayManagement.Shapes;
 using Orchard.Environment;
 using Orchard.Environment.Extensions.Models;
+using Orchard.Tests.Stubs;
 using Orchard.Tests.Utility;
 
 namespace Orchard.Tests.DisplayManagement {
@@ -45,6 +47,7 @@ namespace Orchard.Tests.DisplayManagement {
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<DisplayHelperFactory>().As<IDisplayHelperFactory>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterInstance(new DefaultDisplayManagerTests.TestWorkContextAccessor(workContext)).As<IWorkContextAccessor>();
             builder.RegisterInstance(new SimpleShapes()).WithMetadata("Feature", testFeature);
             builder.RegisterInstance(new RouteCollection());
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css b/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css
index 353fa9a3b..5afaf4635 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css
@@ -5,4 +5,8 @@
 .folderProperties {
     float:right;
     margin:-5em 0 0;
+}
+.previewImage {
+    max-height:640px;
+    max-width:640px;
 }
\ No newline at end of file