diff --git a/pom.xml b/pom.xml
index b724c7a5..42be0128 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<production>false</production>
-		<jpa.show_sql>true</jpa.show_sql>
+		<jpa.show_sql>false</jpa.show_sql>
 		<jpa.datasource.name>java:openejb/Resource/My DataSource</jpa.datasource.name>
 		<jpa.dialect>org.hibernate.dialect.HSQLDialect</jpa.dialect>
 	</properties>
diff --git a/src/main/java/com/commafeed/backend/model/FeedEntryContent.java b/src/main/java/com/commafeed/backend/model/FeedEntryContent.java
index 119b7204..20f197bd 100644
--- a/src/main/java/com/commafeed/backend/model/FeedEntryContent.java
+++ b/src/main/java/com/commafeed/backend/model/FeedEntryContent.java
@@ -1,13 +1,19 @@
 package com.commafeed.backend.model;
 
+import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Lob;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
 @Entity
 @Table(name = "FEEDENTRYCONTENTS")
 @SuppressWarnings("serial")
+@Cacheable
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class FeedEntryContent extends AbstractModel {
 
 	@Column(length = 2048)
diff --git a/src/main/resources/ehcache.xml b/src/main/resources/ehcache.xml
index ae93afa9..f7e0576e 100644
--- a/src/main/resources/ehcache.xml
+++ b/src/main/resources/ehcache.xml
@@ -5,17 +5,17 @@
 
 	<diskStore path="java.io.tmpdir" />
 
-	<defaultCache maxEntriesLocalHeap="10000" eternal="false"
+	<defaultCache maxEntriesLocalHeap="1000000" eternal="false"
 		timeToIdleSeconds="120" timeToLiveSeconds="120" maxEntriesLocalDisk="10000000"
 		diskExpiryThreadIntervalSeconds="120" memoryStoreEvictionPolicy="LRU">
 		<persistence strategy="localTempSwap" />
 	</defaultCache>
-<!-- 
-	<cache name="com.commafeed.backend.model.Feed"
-		maxEntriesLocalHeap="100000" maxEntriesLocalDisk="1000" eternal="false"
-		diskSpoolBufferSizeMB="20" timeToIdleSeconds="300" timeToLiveSeconds="600"
-		memoryStoreEvictionPolicy="LFU" transactionalMode="off">
+
+	<cache name="com.commafeed.backend.model.FeedEntryContent"
+		maxEntriesLocalHeap="1000" eternal="false" timeToIdleSeconds="120"
+		timeToLiveSeconds="120" maxEntriesLocalDisk="100000"
+		diskExpiryThreadIntervalSeconds="120" memoryStoreEvictionPolicy="LRU">
 		<persistence strategy="localTempSwap" />
 	</cache>
- -->
+
 </ehcache>
\ No newline at end of file