diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs
index 89d929582..22f6e12d0 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs
@@ -1,12 +1,30 @@
-using Orchard.ContentManagement;
+using Orchard.Caching;
+using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
 using Orchard.Data;
 using Orchard.Widgets.Models;
 
 namespace Orchard.Widgets.Handlers {
     public class LayerPartHandler : ContentHandler {
-        public LayerPartHandler(IRepository<LayerPartRecord> layersRepository) {
+        private readonly ISignals _signals;
+        public LayerPartHandler(
+            IRepository<LayerPartRecord> layersRepository,
+            ISignals signals) {
+
             Filters.Add(StorageFilter.For(layersRepository));
+            _signals = signals;
+            
+            // Evict cached content when updated, removed or destroyed.
+            OnUpdated<LayerPart>(
+                (context, part) => Invalidate());
+            OnImported<LayerPart>(
+                (context, part) => Invalidate());
+            OnPublished<LayerPart>(
+                (context, part) => Invalidate());
+            OnRemoved<LayerPart>(
+                (context, part) => Invalidate());
+            OnDestroyed<LayerPart>(
+                (context, part) => Invalidate());
         }
 
         protected override void GetItemMetadata(GetContentItemMetadataContext context) {
@@ -16,5 +34,9 @@ namespace Orchard.Widgets.Handlers {
                  context.Metadata.Identity.Add("Layer.LayerName", part.Name);
             }
         }
+
+        private void Invalidate() {
+            _signals.Trigger(LayerPart.AllLayersCacheEvictSignal);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs
index 02f728819..2ee3ede03 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs
@@ -29,5 +29,10 @@ namespace Orchard.Widgets.Models {
             get { return Retrieve(x => x.LayerRule); }
             set { Store(x => x.LayerRule, value); }
         }
+
+        public static string AllLayersCacheEvictSignal =
+            "LayerPart_AllLayers_EvictCache";
+        public static string AllLayersCacheKey =
+            "LayerPart_AllLayers_CacheKey";
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs
index 4f9633deb..8cb36a26a 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs
@@ -6,17 +6,27 @@ using Orchard.Logging;
 using Orchard.Widgets.Models;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Utilities;
+using Orchard.Caching;
 
 namespace Orchard.Widgets.Services{
     public class DefaultLayerEvaluationService : ILayerEvaluationService {
         private readonly IConditionManager _conditionManager;
         private readonly IOrchardServices _orchardServices;
+        private readonly ICacheManager _cacheManager;
+        private readonly ISignals _signals;
 
         private readonly LazyField<int[]> _activeLayerIDs; 
 
-        public DefaultLayerEvaluationService(IConditionManager conditionManager, IOrchardServices orchardServices) {
+        public DefaultLayerEvaluationService(
+            IConditionManager conditionManager,
+            IOrchardServices orchardServices,
+            ICacheManager cacheManager,
+            ISignals signals) {
+
             _conditionManager = conditionManager;
             _orchardServices = orchardServices;
+            _cacheManager = cacheManager;
+            _signals = signals;
 
             Logger = NullLogger.Instance;
             T = NullLocalizer.Instance;
@@ -42,7 +52,15 @@ namespace Orchard.Widgets.Services{
             // Once the Condition Engine is done:
             // Get Layers and filter by zone and rule
             // NOTE: .ForType("Layer") is faster than .Query<LayerPart, LayerPartRecord>()
-            var activeLayers = _orchardServices.ContentManager.Query<LayerPart>().ForType("Layer").List();
+            var activeLayers = _cacheManager.Get(LayerPart.AllLayersCacheKey, true, ctx => {
+                // invalidation signal 
+                ctx.Monitor(_signals.When(LayerPart.AllLayersCacheEvictSignal));
+                // cache
+                return _orchardServices
+                    .ContentManager
+                    .Query<LayerPart>()
+                    .ForType("Layer").List();
+            });
 
             var activeLayerIds = new List<int>();
             foreach (var activeLayer in activeLayers) {