diff --git a/navalplanner-business/pom.xml b/navalplanner-business/pom.xml
index f1517225f..b7b4815c8 100644
--- a/navalplanner-business/pom.xml
+++ b/navalplanner-business/pom.xml
@@ -89,5 +89,9 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
         </dependency>
+        <dependency>
+                <groupId>net.sf.ehcache</groupId>
+                <artifactId>ehcache</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/navalplanner-business/src/main/resources/ehcache.xml b/navalplanner-business/src/main/resources/ehcache.xml
new file mode 100644
index 000000000..6472bdfa8
--- /dev/null
+++ b/navalplanner-business/src/main/resources/ehcache.xml
@@ -0,0 +1,10 @@
+<ehcache>
+    <diskStore path="java.io.tmpdir"/>
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="false"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        overflowToDisk="true"
+    />
+1</ehcache>
\ No newline at end of file
diff --git a/navalplanner-business/src/main/resources/navalplanner-business-hibernate.cfg.xml b/navalplanner-business/src/main/resources/navalplanner-business-hibernate.cfg.xml
index f237c33bb..ac6ab9d37 100644
--- a/navalplanner-business/src/main/resources/navalplanner-business-hibernate.cfg.xml
+++ b/navalplanner-business/src/main/resources/navalplanner-business-hibernate.cfg.xml
@@ -9,5 +9,9 @@
         <property name="hibernate.format_sql">${hibernate.format_sql}</property>
         <property name="hibernate.use_sql_comments">${hibernate.use_sql_comments}</property>
         <property name="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</property>
+        <property name="hibernate.cache.provider_class">net.sf.ehcache.hibernate.EhCacheProvider</property>
+        <property name="hibernate.cache.use_second_level_cache">true</property>
+        <property name="hibernate.cache.use_query_cache">true</property>
+        <property name="hibernate.cache.provider_configuration_file_resource_path">classpath:ehcache.xml</property>
     </session-factory>
 </hibernate-configuration>
diff --git a/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml b/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml
index 0195f53dc..3ebeeb53e 100644
--- a/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml
+++ b/navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml
@@ -19,7 +19,6 @@
     <bean id="sessionFactory"
     class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"
         p:dataSource-ref="dataSource" p:configLocation="classpath:/navalplanner-business-hibernate.cfg.xml">
-
         <property name="mappingResources">
             <list>
                 <value>
diff --git a/navalplanner-business/src/test/resources/ehcache.xml b/navalplanner-business/src/test/resources/ehcache.xml
new file mode 100644
index 000000000..6472bdfa8
--- /dev/null
+++ b/navalplanner-business/src/test/resources/ehcache.xml
@@ -0,0 +1,10 @@
+<ehcache>
+    <diskStore path="java.io.tmpdir"/>
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="false"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        overflowToDisk="true"
+    />
+1</ehcache>
\ No newline at end of file
diff --git a/navalplanner-business/src/test/resources/navalplanner-business-hibernate-test.cfg.xml b/navalplanner-business/src/test/resources/navalplanner-business-hibernate-test.cfg.xml
index a4466c283..1e302cd70 100644
--- a/navalplanner-business/src/test/resources/navalplanner-business-hibernate-test.cfg.xml
+++ b/navalplanner-business/src/test/resources/navalplanner-business-hibernate-test.cfg.xml
@@ -8,5 +8,9 @@
         <property name="hibernate.format_sql">true</property>
         <property name="hibernate.use_sql_comments">true</property>
         <property name="hibernate.hbm2ddl.auto">create</property>
+        <property name="hibernate.cache.provider_class">net.sf.ehcache.hibernate.EhCacheProvider</property>
+        <property name="hibernate.cache.use_second_level_cache">true</property>
+        <property name="hibernate.cache.use_query_cache">true</property>
+        <property name="hibernate.cache.provider_configuration_file_resource_path">classpath:ehcache.xml</property>
     </session-factory>
 </hibernate-configuration>
diff --git a/navalplanner-webapp/src/test/resources/ehcache.xml b/navalplanner-webapp/src/test/resources/ehcache.xml
new file mode 100644
index 000000000..6472bdfa8
--- /dev/null
+++ b/navalplanner-webapp/src/test/resources/ehcache.xml
@@ -0,0 +1,10 @@
+<ehcache>
+    <diskStore path="java.io.tmpdir"/>
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="false"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        overflowToDisk="true"
+    />
+1</ehcache>
\ No newline at end of file
diff --git a/navalplanner-webapp/src/test/resources/navalplanner-webapp-hibernate-test.cfg.xml b/navalplanner-webapp/src/test/resources/navalplanner-webapp-hibernate-test.cfg.xml
index a4466c283..1e302cd70 100644
--- a/navalplanner-webapp/src/test/resources/navalplanner-webapp-hibernate-test.cfg.xml
+++ b/navalplanner-webapp/src/test/resources/navalplanner-webapp-hibernate-test.cfg.xml
@@ -8,5 +8,9 @@
         <property name="hibernate.format_sql">true</property>
         <property name="hibernate.use_sql_comments">true</property>
         <property name="hibernate.hbm2ddl.auto">create</property>
+        <property name="hibernate.cache.provider_class">net.sf.ehcache.hibernate.EhCacheProvider</property>
+        <property name="hibernate.cache.use_second_level_cache">true</property>
+        <property name="hibernate.cache.use_query_cache">true</property>
+        <property name="hibernate.cache.provider_configuration_file_resource_path">classpath:ehcache.xml</property>
     </session-factory>
 </hibernate-configuration>
diff --git a/pom.xml b/pom.xml
index 0da2462cb..0950719d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,6 +513,11 @@
                 <artifactId>timelinez</artifactId>
                 <version>1.2_1</version>
             </dependency>
+            <dependency>
+                <groupId>net.sf.ehcache</groupId>
+                <artifactId>ehcache</artifactId>
+                <version>1.6.2</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>