diff --git a/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java b/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java
index 4731af7c..72a1029e 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.NoResultException;
 import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
@@ -13,33 +14,38 @@ import org.apache.commons.lang.ObjectUtils;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.FeedCategory_;
 import com.commafeed.backend.model.User;
+import com.commafeed.backend.model.User_;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 @Stateless
 public class FeedCategoryDAO extends GenericDAO<FeedCategory> {
 
+	@SuppressWarnings("unchecked")
 	public List<FeedCategory> findAll(User user) {
 
 		CriteriaQuery<FeedCategory> query = builder.createQuery(getType());
 		Root<FeedCategory> root = query.from(getType());
+		Join<FeedCategory, User> userJoin = (Join<FeedCategory, User>) root
+				.fetch(FeedCategory_.user);
 
-		query.where(builder.equal(root.get(FeedCategory_.user), user));
-		root.fetch(FeedCategory_.user.getName());
+		query.where(builder.equal(userJoin.get(User_.id), user.getId()));
 
-		return em.createQuery(query).getResultList();
+		return cache(em.createQuery(query)).getResultList();
 	}
 
 	public FeedCategory findById(User user, Long id) {
 		CriteriaQuery<FeedCategory> query = builder.createQuery(getType());
 		Root<FeedCategory> root = query.from(getType());
 
-		Predicate p1 = builder.equal(root.get(FeedCategory_.user), user);
+		Predicate p1 = builder.equal(
+				root.get(FeedCategory_.user).get(User_.id), user.getId());
 		Predicate p2 = builder.equal(root.get(FeedCategory_.id), id);
 
 		query.where(p1, p2);
 
-		return Iterables.getFirst(em.createQuery(query).getResultList(), null);
+		return Iterables.getFirst(cache(em.createQuery(query)).getResultList(),
+				null);
 	}
 
 	public FeedCategory findByName(User user, String name, FeedCategory parent) {
diff --git a/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java b/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java
index acf088b1..22ffe7ec 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java
@@ -8,11 +8,16 @@ import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import org.hibernate.Hibernate;
+
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
+import com.commafeed.backend.model.FeedCategory_;
 import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.FeedSubscription_;
+import com.commafeed.backend.model.Feed_;
 import com.commafeed.backend.model.User;
+import com.commafeed.backend.model.User_;
 import com.google.common.collect.Iterables;
 
 @Stateless
@@ -22,7 +27,8 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 		CriteriaQuery<FeedSubscription> query = builder.createQuery(getType());
 		Root<FeedSubscription> root = query.from(getType());
 
-		Predicate p1 = builder.equal(root.get(FeedSubscription_.user), user);
+		Predicate p1 = builder.equal(
+				root.get(FeedSubscription_.user).get(User_.id), user.getId());
 		Predicate p2 = builder.equal(root.get(FeedSubscription_.id), id);
 
 		root.fetch(FeedSubscription_.feed, JoinType.LEFT);
@@ -30,11 +36,22 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 
 		query.where(p1, p2);
 
-		return Iterables.getFirst(em.createQuery(query).getResultList(), null);
+		FeedSubscription sub = Iterables.getFirst(cache(em.createQuery(query))
+				.getResultList(), null);
+		initRelations(sub);
+		return sub;
 	}
 
 	public List<FeedSubscription> findByFeed(Feed feed) {
-		return findByField(FeedSubscription_.feed, feed);
+		CriteriaQuery<FeedSubscription> query = builder.createQuery(getType());
+		Root<FeedSubscription> root = query.from(getType());
+
+		query.where(builder.equal(root.get(FeedSubscription_.feed)
+				.get(Feed_.id), feed.getId()));
+		List<FeedSubscription> list = cache(em.createQuery(query))
+				.getResultList();
+		initRelations(list);
+		return list;
 	}
 
 	public FeedSubscription findByFeed(User user, Feed feed) {
@@ -42,15 +59,20 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 		CriteriaQuery<FeedSubscription> query = builder.createQuery(getType());
 		Root<FeedSubscription> root = query.from(getType());
 
-		Predicate p1 = builder.equal(root.get(FeedSubscription_.user), user);
-		Predicate p2 = builder.equal(root.get(FeedSubscription_.feed), feed);
+		Predicate p1 = builder.equal(
+				root.get(FeedSubscription_.user).get(User_.id), user.getId());
+		Predicate p2 = builder.equal(
+				root.get(FeedSubscription_.feed).get(Feed_.id), feed.getId());
 
 		root.fetch(FeedSubscription_.feed, JoinType.LEFT);
 		root.fetch(FeedSubscription_.category, JoinType.LEFT);
 
 		query.where(p1, p2);
 
-		return Iterables.getFirst(em.createQuery(query).getResultList(), null);
+		FeedSubscription sub = Iterables.getFirst(cache(em.createQuery(query))
+				.getResultList(), null);
+		initRelations(sub);
+		return sub;
 	}
 
 	public List<FeedSubscription> findAll(User user) {
@@ -61,9 +83,13 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 		root.fetch(FeedSubscription_.feed, JoinType.LEFT);
 		root.fetch(FeedSubscription_.category, JoinType.LEFT);
 
-		query.where(builder.equal(root.get(FeedSubscription_.user), user));
+		query.where(builder.equal(root.get(FeedSubscription_.user)
+				.get(User_.id), user.getId()));
 
-		return em.createQuery(query).getResultList();
+		List<FeedSubscription> list = cache(em.createQuery(query))
+				.getResultList();
+		initRelations(list);
+		return list;
 	}
 
 	public List<FeedSubscription> findByCategory(User user,
@@ -72,25 +98,30 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 		CriteriaQuery<FeedSubscription> query = builder.createQuery(getType());
 		Root<FeedSubscription> root = query.from(getType());
 
-		Predicate p1 = builder.equal(root.get(FeedSubscription_.user), user);
-		Predicate p2 = builder.equal(root.get(FeedSubscription_.category),
-				category);
+		Predicate p1 = builder.equal(
+				root.get(FeedSubscription_.user).get(User_.id), user.getId());
+		Predicate p2 = builder.equal(
+				root.get(FeedSubscription_.category).get(FeedCategory_.id),
+				category.getId());
 
 		query.where(p1, p2);
 
-		return em.createQuery(query).getResultList();
+		List<FeedSubscription> list = cache(em.createQuery(query))
+				.getResultList();
+		initRelations(list);
+		return list;
 	}
 
-	public List<FeedSubscription> findWithoutCategories(User user) {
+	private void initRelations(List<FeedSubscription> list) {
+		for (FeedSubscription sub : list) {
+			initRelations(sub);
+		}
+	}
 
-		CriteriaQuery<FeedSubscription> query = builder.createQuery(getType());
-		Root<FeedSubscription> root = query.from(getType());
-
-		Predicate p1 = builder.equal(root.get(FeedSubscription_.user), user);
-		Predicate p2 = builder.isNull(root.get(FeedSubscription_.category));
-
-		query.where(p1, p2);
-
-		return em.createQuery(query).getResultList();
+	private void initRelations(FeedSubscription sub) {
+		if (sub != null) {
+			Hibernate.initialize(sub.getFeed());
+			Hibernate.initialize(sub.getCategory());
+		}
 	}
 }
diff --git a/src/main/java/com/commafeed/backend/model/FeedCategory.java b/src/main/java/com/commafeed/backend/model/FeedCategory.java
index 44811a94..31e4f80a 100644
--- a/src/main/java/com/commafeed/backend/model/FeedCategory.java
+++ b/src/main/java/com/commafeed/backend/model/FeedCategory.java
@@ -28,9 +28,11 @@ public class FeedCategory extends AbstractModel {
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(nullable = false)
+	@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
 	private User user;
 
 	@ManyToOne(fetch = FetchType.LAZY)
+	@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
 	private FeedCategory parent;
 
 	@OneToMany(mappedBy = "parent")
diff --git a/src/main/java/com/commafeed/backend/model/FeedSubscription.java b/src/main/java/com/commafeed/backend/model/FeedSubscription.java
index 957d7b97..0fc0073a 100644
--- a/src/main/java/com/commafeed/backend/model/FeedSubscription.java
+++ b/src/main/java/com/commafeed/backend/model/FeedSubscription.java
@@ -24,16 +24,19 @@ public class FeedSubscription extends AbstractModel {
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(nullable = false)
+	@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
 	private User user;
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(nullable = false)
+	@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
 	private Feed feed;
 
 	@Column(length = 128, nullable = false)
 	private String title;
 
 	@ManyToOne(fetch = FetchType.LAZY)
+	@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
 	private FeedCategory category;
 
 	@OneToMany(mappedBy = "subscription", cascade = CascadeType.REMOVE)