Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -r332dc363ec2e219166fdb26fd55b0342c05e9607 -r59390e4bf349a52e22884134d890724cac1440be
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 332dc363ec2e219166fdb26fd55b0342c05e9607)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 59390e4bf349a52e22884134d890724cac1440be)
@@ -10,6 +10,7 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -21,6 +22,10 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
 import org.lamsfoundation.lams.qb.service.IQbService;
 
 /**
@@ -151,13 +156,15 @@
     @Column(name = "autocomplete_enabled")
     private boolean autocompleteEnabled;
 
-    @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @Fetch(FetchMode.SELECT)
     @OrderBy("displayOrder")
-    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private List<QbOption> qbOptions = new ArrayList<>();
 
-    @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL)
-    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @Fetch(FetchMode.SELECT)
+    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private List<QbQuestionUnit> units = new ArrayList<>();
 
     // non-persistent field, useful for displaying other versions of this question