diff --git a/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorTest.java b/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorTest.java
new file mode 100644
index 0000000000..875fd2a25e
--- /dev/null
+++ b/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorTest.java
@@ -0,0 +1,43 @@
+package org.baeldung.ehcache;
+
+import static org.junit.Assert.*;
+
+import org.baeldung.ehcache.calculator.SquaredCalculator;
+import org.baeldung.ehcache.config.CacheHelper;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SquareCalculatorTest {
+    SquaredCalculator squaredCalculator = new SquaredCalculator();
+    CacheHelper cacheHelper = new CacheHelper();
+
+    @Before
+    public void setup() {
+        squaredCalculator.setCache(cacheHelper);
+
+    }
+
+    @Test
+    public void whenCalculatingSquareValueOnce_thenCacheDontHaveValues() {
+        for (int i = 10; i < 15; i++) {
+            assertFalse(cacheHelper.getSquareNumberCache().containsKey(i));
+            System.out.println("Square value of " + i + " is: "
+                    + squaredCalculator.getSquareValueOfNumber(i) + "\n");
+        }
+    }
+
+    @Test
+    public void whenCalculatingSquareValueAgain_thenCacheHasAllValues() {
+        for (int i = 10; i < 15; i++) {
+            assertFalse(cacheHelper.getSquareNumberCache().containsKey(i));
+            System.out.println("Square value of " + i + " is: "
+                    + squaredCalculator.getSquareValueOfNumber(i) + "\n");
+        }
+        
+        for (int i = 10; i < 15; i++) {
+            assertTrue(cacheHelper.getSquareNumberCache().containsKey(i));
+            System.out.println("Square value of " + i + " is: "
+                    + squaredCalculator.getSquareValueOfNumber(i) + "\n");
+        }
+    }
+}