diff --git a/diylc/diylc-core/src/main/java/org/diylc/presenter/DrawingCache.java b/diylc/diylc-core/src/main/java/org/diylc/presenter/DrawingCache.java
index e3f334b1..88e9d789 100644
--- a/diylc/diylc-core/src/main/java/org/diylc/presenter/DrawingCache.java
+++ b/diylc/diylc-core/src/main/java/org/diylc/presenter/DrawingCache.java
@@ -181,6 +181,11 @@ public class DrawingCache {
   
   private CacheValue renderAndCache(IDIYComponent<?> component, G2DWrapper g2d, ComponentState componentState,
       boolean outlineMode, Project project, double zoom, double scaleFactor, int zOrder) {
+
+    if (!g2d.getClipBounds().intersects(component.getCachingBounds())) {
+      return null;
+    }
+
     // if we need to apply caching
     Point2D firstPoint = component.getControlPoint(0);