Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r3bb66b73292b37e2f3773579947b7ead5017ccea -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 3bb66b73292b37e2f3773579947b7ead5017ccea)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -469,41 +469,18 @@
                     <transaction mode="NONE"/>
                 </local-cache> 
             </cache-container>
-            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
+            <cache-container name="hibernate" default-cache="entity" module="org.infinispan.hibernate-cache" statistics-enabled="true">
                 <local-cache name="entity">
-                    <transaction mode="NON_XA"/>
-                    <object-memory size="10000"/>
-                    <expiration max-idle="100000"/>
+                    <transaction mode="NON_XA" />
+                    <object-memory />
+                    <expiration lifespan="5000" interval="1000" />
                 </local-cache>
                 <local-cache name="local-query">
-                    <object-memory size="10000"/>
-                    <expiration max-idle="100000"/>
+                    <object-memory />
+                    <expiration lifespan="5000" interval="1000"/>
                 </local-cache>
                 <local-cache name="timestamps"/>
             </cache-container>
-            <!-- LAMS configuration for Hibernate. At the moment the default one above is used.
-			<cache-container name="hibernate" module="org.hibernate">
-                <local-cache name="entity" statistics-enabled="true">
-                   	<transaction mode="NON_XA"/>
-                    <eviction strategy="LRU" max-entries="50000"/>
-                    <expiration max-idle="100000" lifespan="1000000"/>
-                </local-cache>
-                <local-cache name="local-query" statistics-enabled="true">
-                    <transaction mode="NONE"/>
-                    <eviction strategy="LRU" max-entries="10000"/>
-                    <expiration max-idle="100000"/>
-                </local-cache>
-                <local-cache name="timestamps" statistics-enabled="true">
-                    <transaction mode="NONE"/>
-                    <eviction strategy="NONE"/>
-                </local-cache>
-                <local-cache name="contentrepository-entity" statistics-enabled="true">
-                    <transaction mode="NON_XA"/>
-                    <eviction strategy="LRU" max-entries="200"/>
-                    <expiration max-idle="100000" lifespan="900000"/>
-                </local-cache>
-            </cache-container>
-             -->
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:io:3.0">
             <worker name="default"/>
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -r334dd0524f23310119ec31a6949cf75ea7340da1 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 334dd0524f23310119ec31a6949cf75ea7340da1)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -14,14 +14,26 @@
 			<prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
 			<prop key="hibernate.show_sql">false</prop>
 			<prop key="hibernate.current_session_context_class">org.lamsfoundation.lams.util.hibernate.TransactionAwareSessionContext</prop>
-		    <prop key="hibernate.cache.use_second_level_cache">false</prop>
-		    <prop key="hibernate.cache.use_query_cache">false</prop>
-            <prop key="hibernate.cache.region.factory_class">org.hibernate.cache.infinispan.JndiInfinispanRegionFactory</prop>
-            <prop key="hibernate.cache.default_cache_concurrency_strategy">TRANSACTIONAL</prop>
+			
+			<prop key="hibernate.cache.use_query_cache">true</prop>
+		    <prop key="hibernate.cache.use_second_level_cache">true</prop>
+            <prop key="javax.persistence.sharedCache.mode">ENABLE_SELECTIVE</prop>
+            <prop key="hibernate.cache.infinispan.entity.eviction.strategy">NONE</prop>
+			<prop key="hibernate.cache.infinispan.query.eviction.strategy">NONE</prop>
+            <prop key="hibernate.cache.infinispan.entity.expiration.lifespan">5000</prop>
+			<prop key="hibernate.cache.infinispan.query.expiration.lifespan">5000</prop>
+            <prop key="hibernate.cache.infinispan.entity.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.query.expiration.max_idle">-1</prop>
+            <prop key="hibernate.cache.infinispan.entity.expiration.wake_up_interval">1000</prop>
+			<prop key="hibernate.cache.infinispan.query.expiration.wake_up_interval">1000</prop>
+			<prop key="hibernate.cache.infinispan.statistics">true</prop>
+
             <prop key="hibernate.transaction.jta.platform">org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform</prop>   
             <prop key="hibernate.transaction.coordinator_class">jta</prop>   
-             
+            
             <!-- 
+            <prop key="hibernate.cache.region.factory_class">org.infinispan.hibernate.cache.v53.InfinispanRegionFactory</prop>
+            <prop key="hibernate.cache.default_cache_concurrency_strategy">TRANSACTIONAL</prop>
             <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNode.cfg">contentrepository-entity</prop>
             <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNode.crNodeVersions.cfg">contentrepository-entity</prop>
             <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNodeVersion.cfg">contentrepository-entity</prop>
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -33,6 +33,7 @@
 import java.util.TreeSet;
 import java.util.Vector;
 
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.DiscriminatorColumn;
@@ -70,6 +71,7 @@
  * add a ACTIVITY_TYPE constant.
  */
 @Entity
+@Cacheable
 @Table(name = "lams_learning_activity")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @DiscriminatorColumn(name = "learning_activity_type_id", discriminatorType = DiscriminatorType.INTEGER)
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
===================================================================
diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -32,6 +32,7 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -47,6 +48,8 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.SortComparator;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -57,6 +60,7 @@
  * @author Manpreet Minhas
  */
 @Entity
+@Cacheable
 @Table(name = "lams_learning_design")
 public class LearningDesign implements Serializable {
 
@@ -144,20 +148,21 @@
     private LearningDesign originalLearningDesign;
 
     @OneToMany(mappedBy = "learningDesign")
-    private Set<Lesson> lessons = new HashSet<Lesson>();
+    private Set<Lesson> lessons = new HashSet<>();
 
     @OneToMany(mappedBy = "learningDesign", cascade = CascadeType.ALL, orphanRemoval = true)
-    private Set<Transition> transitions = new HashSet<Transition>();
+    private Set<Transition> transitions = new HashSet<>();
 
     @OneToMany(mappedBy = "learningDesign", cascade = CascadeType.ALL, orphanRemoval = true)
     @SortComparator(ActivityOrderComparator.class)
-    private Set<Activity> activities = new TreeSet<Activity>(new ActivityOrderComparator());
+    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    private Set<Activity> activities = new TreeSet<>(new ActivityOrderComparator());
 
     @OneToMany(mappedBy = "learningDesign", cascade = CascadeType.ALL, orphanRemoval = true)
-    private Set<Competence> competences = new HashSet<Competence>();
+    private Set<Competence> competences = new HashSet<>();
 
     @OneToMany(mappedBy = "learningDesignId", cascade = CascadeType.ALL, orphanRemoval = true)
-    private Set<LearningDesignAnnotation> annotations = new HashSet<LearningDesignAnnotation>();
+    private Set<LearningDesignAnnotation> annotations = new HashSet<>();
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "workspace_folder_id")
@@ -248,7 +253,7 @@
 	this.editOverrideLock = false;
 	this.designVersion = 1;
 	this.removed = Boolean.FALSE;
-	this.activities = new TreeSet<Activity>(new ActivityOrderComparator());
+	this.activities = new TreeSet<>(new ActivityOrderComparator());
     }
 
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
diff -u -r316c9b6bf6925afe5bd5a0b111df0626b312af37 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision 316c9b6bf6925afe5bd5a0b111df0626b312af37)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -27,6 +27,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.ColumnResult;
@@ -125,6 +126,7 @@
 	@ColumnResult(name = "dependent", type = Boolean.class),
 	@ColumnResult(name = "scheduledFinish", type = Boolean.class) }))
 @Entity
+@Cacheable
 @Table(name = "lams_lesson")
 public class Lesson implements Serializable {
 
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java
===================================================================
diff -u -rfcb79f2ce8462f39e3132b2a65f779f05b0274c7 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java	(.../QbOption.java)	(revision fcb79f2ce8462f39e3132b2a65f779f05b0274c7)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java	(.../QbOption.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 
+import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -20,6 +21,7 @@
  * @author Marcin Cieslak
  */
 @Entity
+@Cacheable
 @Table(name = "lams_qb_option")
 public class QbOption implements Serializable, Cloneable, Comparable<QbOption> {
     private static final long serialVersionUID = -2354311780882736829L;
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -r6517e6082d2775fcc434d86d274cead255d7c20b -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 6517e6082d2775fcc434d86d274cead255d7c20b)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.UUID;
 
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -21,6 +22,8 @@
 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;
@@ -31,6 +34,7 @@
  * @author Marcin Cieslak
  */
 @Entity
+@Cacheable
 @Table(name = "lams_qb_question")
 public class QbQuestion implements Serializable, Cloneable {
     private static final long serialVersionUID = -6287273838239262151L;
@@ -156,10 +160,12 @@
     @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL)
     @Fetch(FetchMode.SUBSELECT)
     @OrderBy("displayOrder")
+    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private List<QbOption> qbOptions = new ArrayList<>();
 
     @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL)
     @Fetch(FetchMode.SUBSELECT)
+    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private List<QbQuestionUnit> units = new ArrayList<>();
 
     // non-persistent field, useful for displaying other versions of this question
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestionUnit.java
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestionUnit.java	(.../QbQuestionUnit.java)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestionUnit.java	(.../QbQuestionUnit.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 
+import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -20,6 +21,7 @@
  * @author Andrey Balan
  */
 @Entity
+@Cacheable
 @Table(name = "lams_qb_question_unit")
 public class QbQuestionUnit implements Serializable, Cloneable, Comparable<QbQuestionUnit> {
     private static final long serialVersionUID = -6772525485898794744L;
Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java
===================================================================
diff -u -r0b25275e793528d944a724b2ccd4d5a87202f11f -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java	(.../RatingCriteriaDAO.java)	(revision 0b25275e793528d944a724b2ccd4d5a87202f11f)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java	(.../RatingCriteriaDAO.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -37,7 +37,7 @@
 public class RatingCriteriaDAO extends LAMSBaseDAO implements IRatingCriteriaDAO {
 
     private static final String FIND_BY_TOOL_CONTENT_ID = "FROM " + RatingCriteria.class.getName()
-	    + " AS r WHERE r.toolContentId=? order by r.orderId asc";
+	    + " AS r WHERE r.toolContentId= :toolContentId order by r.orderId asc";
 
     private static final String IS_COMMENTS_ENABLED_FOR_TOOL_CONTENT_ID = "SELECT COUNT(*) FROM "
 	    + RatingCriteria.class.getName() + " AS r WHERE r.toolContentId=? AND r.ratingStyle = 0";
@@ -64,7 +64,8 @@
 
     @Override
     public List<RatingCriteria> getByToolContentId(Long toolContentId) {
-	return (doFind(FIND_BY_TOOL_CONTENT_ID, new Object[] { toolContentId }));
+	return getSession().createQuery(FIND_BY_TOOL_CONTENT_ID, RatingCriteria.class)
+		.setParameter("toolContentId", toolContentId).setCacheable(true).getResultList();
     }
 
     @Override
@@ -119,6 +120,7 @@
 	return result == null ? 1 : result.intValue() + 1;
     }
 
+    @Override
     public List<String> getRubricsColumnHeaders(int groupId) {
 	return getSession().createQuery(GET_RUBRICS_COLUMN_HEADERS, String.class).setParameter("groupId", groupId)
 		.getResultList();
Index: lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java
===================================================================
diff -u -r0b25275e793528d944a724b2ccd4d5a87202f11f -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java	(.../RatingCriteria.java)	(revision 0b25275e793528d944a724b2ccd4d5a87202f11f)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java	(.../RatingCriteria.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.DiscriminatorColumn;
@@ -83,6 +84,7 @@
  */
 
 @Entity
+@Cacheable
 @Table(name = "lams_rating_criteria")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @DiscriminatorColumn(name = "rating_criteria_type_id", discriminatorType = DiscriminatorType.INTEGER)
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -rd4e455d6806b6c48cca0b6e8ee87f256a92f123a -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision d4e455d6806b6c48cca0b6e8ee87f256a92f123a)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -35,6 +35,7 @@
 import java.util.TreeMap;
 import java.util.UUID;
 
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
@@ -69,6 +70,7 @@
 import org.lamsfoundation.lams.util.LanguageUtil;
 
 @Entity
+@Cacheable
 @Table(name = "lams_user")
 public class User implements Serializable, Comparable<User> {
     private static final long serialVersionUID = 8711215689846731994L;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
===================================================================
diff -u -r18b228bd194ec58143b063ea9e0329c5ed12c276 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java	(.../AssessmentQuestionResultDAOHibernate.java)	(revision 18b228bd194ec58143b063ea9e0329c5ed12c276)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java	(.../AssessmentQuestionResultDAOHibernate.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -40,11 +40,11 @@
 
     private static final String FIND_BY_ASSESSMENT_QUESTION_AND_USER = "FROM "
 	    + AssessmentQuestionResult.class.getName() + " AS q, " + AssessmentResult.class.getName() + " AS r "
-	    + " WHERE q.assessmentResult.uid = r.uid and r.assessment.uid = ? AND r.user.userId =? AND q.qbToolQuestion.uid =? ORDER BY r.startDate ASC";
+	    + " WHERE q.assessmentResult.uid = r.uid and r.assessment.uid = :assessmentUid AND r.user.userId = :userId AND q.qbToolQuestion.uid = :qbToolQuestionUid ORDER BY r.startDate ASC";
 
     private static final String FIND_BY_QUESTION_UID = "FROM " + AssessmentQuestionResult.class.getName()
 	    + " AS queRes " + " WHERE queRes.qbToolQuestion.uid =:questionUid ORDER BY queRes.finishDate ASC";
-    
+
     private static final String FIND_WRONG_ANSWERS_NUMBER = "SELECT COUNT(q) FROM  "
 	    + AssessmentQuestionResult.class.getName() + " AS q, " + AssessmentResult.class.getName() + " AS r "
 	    + " WHERE q.assessmentResult.uid = r.uid AND r.assessment.uid = ? AND r.user.userId =? AND q.qbToolQuestion.uid =? AND (ROUND(q.mark + q.penalty) < q.maxMark) AND (r.finishDate != null)";
@@ -66,8 +66,10 @@
     @Override
     @SuppressWarnings("unchecked")
     public List<Object[]> getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid) {
-	return (List<Object[]>) doFind(FIND_BY_ASSESSMENT_QUESTION_AND_USER,
-		new Object[] { assessmentUid, userId, questionUid });
+	Query<Object[]> query = getSession().createQuery(FIND_BY_ASSESSMENT_QUESTION_AND_USER)
+		.setParameter("assessmentUid", assessmentUid).setParameter("userId", userId)
+		.setParameter("qbToolQuestionUid", questionUid).setCacheable(true);
+	return query.getResultList();
     }
 
     @Override
@@ -81,8 +83,8 @@
 
     @Override
     public List<AssessmentQuestionResult> getQuestionResultsByQuestionUid(final Long questionUid) {
-	String FIND_BY_QUESTION_UID = "FROM " + AssessmentQuestionResult.class.getName()
-		    + " AS queRes " + " WHERE queRes.qbToolQuestion.uid =:questionUid AND queRes.finishDate != null ORDER BY queRes.finishDate ASC";
+	String FIND_BY_QUESTION_UID = "FROM " + AssessmentQuestionResult.class.getName() + " AS queRes "
+		+ " WHERE queRes.qbToolQuestion.uid =:questionUid AND queRes.finishDate != null ORDER BY queRes.finishDate ASC";
 	Query<AssessmentQuestionResult> q = getSession().createQuery(FIND_BY_QUESTION_UID,
 		AssessmentQuestionResult.class);
 	q.setParameter("questionUid", questionUid);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
===================================================================
diff -u -re194f22014c7cbffaf5168f1982aa89e7c34c34d -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision e194f22014c7cbffaf5168f1982aa89e7c34c34d)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -190,7 +190,8 @@
 
     @Override
     public AssessmentResult getLastAssessmentResult(Long assessmentUid, Long userId) {
-	Query<AssessmentResult> q = getSession().createQuery(FIND_LAST_BY_ASSESSMENT_AND_USER, AssessmentResult.class);
+	Query<AssessmentResult> q = getSession().createQuery(FIND_LAST_BY_ASSESSMENT_AND_USER, AssessmentResult.class)
+		.setCacheable(true);
 	q.setParameter("userId", userId);
 	q.setParameter("assessmentUid", assessmentUid);
 	return q.uniqueResult();
@@ -208,7 +209,7 @@
     @Override
     public AssessmentResult getLastFinishedAssessmentResult(Long assessmentUid, Long userId) {
 	Query<AssessmentResult> q = getSession().createQuery(FIND_LAST_FINISHED_BY_ASSESSMENT_AND_USER,
-		AssessmentResult.class);
+		AssessmentResult.class).setCacheable(true);
 	q.setParameter("userId", userId);
 	q.setParameter("assessmentUid", assessmentUid);
 	return q.uniqueResult();
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java	(.../AssessmentSessionDAOHibernate.java)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java	(.../AssessmentSessionDAOHibernate.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -34,16 +34,17 @@
 public class AssessmentSessionDAOHibernate extends LAMSBaseDAO implements AssessmentSessionDAO {
 
     private static final String FIND_BY_SESSION_ID = "from " + AssessmentSession.class.getName()
-	    + " as p where p.sessionId=?";
+	    + " as p where p.sessionId= :sessionId";
 
     @SuppressWarnings("unchecked")
     @Override
     public AssessmentSession getSessionBySessionId(Long sessionId) {
-	List<AssessmentSession> list = (List<AssessmentSession>) doFind(FIND_BY_SESSION_ID, sessionId);
+	List<AssessmentSession> list = getSession().createQuery(FIND_BY_SESSION_ID)
+		.setParameter("sessionId", sessionId).setCacheable(true).getResultList();
 	if (list == null || list.size() == 0) {
 	    return null;
 	}
-	return (AssessmentSession) list.get(0);
+	return list.get(0);
     }
 
     @Override
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -r6517e6082d2775fcc434d86d274cead255d7c20b -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 6517e6082d2775fcc434d86d274cead255d7c20b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -32,6 +32,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
@@ -51,6 +52,8 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.SortComparator;
 import org.lamsfoundation.lams.qb.model.QbToolQuestion;
@@ -62,6 +65,7 @@
  * @author Andrey Balan
  */
 @Entity
+@Cacheable
 @Table(name = "tl_laasse10_assessment")
 public class Assessment implements Cloneable {
     private static final Logger log = Logger.getLogger(Assessment.class);
@@ -183,6 +187,7 @@
     @OneToMany
     @JoinColumn(name = "assessment_uid")
     @SortComparator(QbToolQuestion.QbToolQuestionComparator.class)
+    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<AssessmentQuestion> questions = new TreeSet<>();
 
     // assessment questions references that form question list
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.java
===================================================================
diff -u -rdcdc1487609bd4f00afaa93c09272d84ab0cd325 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.java	(.../AssessmentOptionAnswer.java)	(revision dcdc1487609bd4f00afaa93c09272d84ab0cd325)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.java	(.../AssessmentOptionAnswer.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -23,6 +23,7 @@
 
 package org.lamsfoundation.lams.tool.assessment.model;
 
+import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -36,6 +37,7 @@
  * @author Andrey Balan
  */
 @Entity
+@Cacheable
 @Table(name = "tl_laasse10_option_answer")
 public class AssessmentOptionAnswer implements Cloneable {
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
===================================================================
diff -u -r114a48edf9af0975b8d67d3240ae2de2a773de46 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision 114a48edf9af0975b8d67d3240ae2de2a773de46)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -25,6 +25,7 @@
 
 import java.io.Serializable;
 
+import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.PrimaryKeyJoinColumn;
@@ -43,6 +44,7 @@
  * @author Andrey Balan
  */
 @Entity
+@Cacheable
 @Table(name = "tl_laasse10_assessment_question")
 //in this entity's table primary key is "uid", but it references "tool_question_uid" in lams_qb_tool_question
 @PrimaryKeyJoinColumn(name = "uid")
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
===================================================================
diff -u -r6517e6082d2775fcc434d86d274cead255d7c20b -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision 6517e6082d2775fcc434d86d274cead255d7c20b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -27,6 +27,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -39,6 +40,8 @@
 import javax.persistence.Transient;
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.lamsfoundation.lams.qb.model.QbToolAnswer;
 import org.lamsfoundation.lams.tool.assessment.dto.QuestionDTO;
@@ -49,6 +52,7 @@
  * @author Andrey Balan
  */
 @Entity
+@Cacheable
 @Table(name = "tl_laasse10_question_result")
 //in this entity's table primary key is "uid", but it references "answer_uid" in lams_qb_tool_answer
 @PrimaryKeyJoinColumn(name = "uid")
@@ -84,6 +88,7 @@
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "question_result_uid")
+    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<AssessmentOptionAnswer> optionAnswers = new LinkedHashSet<>();
 
     // *************** NON Persist Fields ********************
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
===================================================================
diff -u -r6517e6082d2775fcc434d86d274cead255d7c20b -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java	(.../AssessmentResult.java)	(revision 6517e6082d2775fcc434d86d274cead255d7c20b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java	(.../AssessmentResult.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -27,6 +27,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -40,6 +41,8 @@
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.SortComparator;
 import org.lamsfoundation.lams.qb.model.QbToolAnswer;
 
@@ -49,6 +52,7 @@
  * @author Andrey Balan
  */
 @Entity
+@Cacheable
 @Table(name = "tl_laasse10_assessment_result")
 public class AssessmentResult {
 
@@ -91,6 +95,7 @@
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "result_uid")
     @SortComparator(QbToolAnswer.QbToolAnswerComparator.class)
+    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<AssessmentQuestionResult> questionResults = new TreeSet<>();
 
     // *************** NON Persist Fields ********************
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java
===================================================================
diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -rfd9592fa74d56ccd0719c7245b3424b3523f2197
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java	(.../AssessmentSession.java)	(revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.java	(.../AssessmentSession.java)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
@@ -27,6 +27,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -46,6 +47,7 @@
  * @author Andrey Balan
  */
 @Entity
+@Cacheable
 @Table(name = "tl_laasse10_session")
 public class AssessmentSession {