diff --git a/src/main/java/net/helenus/core/operation/AbstractFilterStreamOperation.java b/src/main/java/net/helenus/core/operation/AbstractFilterStreamOperation.java
index 2f707a9..e0f4bca 100644
--- a/src/main/java/net/helenus/core/operation/AbstractFilterStreamOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractFilterStreamOperation.java
@@ -22,8 +22,7 @@ import java.util.Map;
 import net.helenus.core.*;
 import net.helenus.mapping.HelenusProperty;
 
-public abstract class AbstractFilterStreamOperation<
-        E, O extends AbstractFilterStreamOperation<E, O>>
+public abstract class AbstractFilterStreamOperation<E, O extends AbstractFilterStreamOperation<E, O>>
     extends AbstractStreamOperation<E, O> {
 
   protected Map<HelenusProperty, Filter<?>> filters = null;
diff --git a/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java b/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
index afe577d..c5f8b2c 100644
--- a/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
@@ -164,16 +164,12 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
                                   SerializationUtils.<Serializable>clone(
                                       (Serializable) cachedResult));
                     }
+                    updateCache = false;
                     sessionCacheHits.mark();
                     cacheHits.mark();
                     uow.recordCacheAndDatabaseOperationCount(1, 0);
-                    if (result.isPresent()) {
-                      updateCache = true;
-                    } else {
-                      updateCache = false;
-                    }
                   } else {
-                    updateCache = false;
+                    updateCache = true;
                     sessionCacheMiss.mark();
                     cacheMiss.mark();
                     uow.recordCacheAndDatabaseOperationCount(-1, 0);
@@ -184,9 +180,9 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
               }
             } else {
               //TODO(gburd): look in statement cache for results
+              updateCache = false; //true;
               cacheMiss.mark();
               uow.recordCacheAndDatabaseOperationCount(-1, 0);
-              updateCache = false; //true;
             }
           } else {
             updateCache = false;
diff --git a/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java b/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
index 07b5649..f612119 100644
--- a/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
@@ -168,17 +168,13 @@ public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperati
                       result =
                           (E) SerializationUtils.<Serializable>clone((Serializable) cachedResult);
                     }
+                    updateCache = false;
                     resultStream = Stream.of(result);
                     sessionCacheHits.mark();
                     cacheHits.mark();
                     uow.recordCacheAndDatabaseOperationCount(1, 0);
-                    if (result != null) {
-                      updateCache = true;
-                    } else {
-                      updateCache = false;
-                    }
                   } else {
-                    updateCache = false;
+                    updateCache = true;
                     sessionCacheMiss.mark();
                     cacheMiss.mark();
                     uow.recordCacheAndDatabaseOperationCount(-1, 0);
diff --git a/src/main/java/net/helenus/mapping/annotation/Column.java b/src/main/java/net/helenus/mapping/annotation/Column.java
index 886493e..1ca2cd4 100644
--- a/src/main/java/net/helenus/mapping/annotation/Column.java
+++ b/src/main/java/net/helenus/mapping/annotation/Column.java
@@ -61,7 +61,7 @@ public @interface Column {
   boolean forceQuote() default false;
 
   /**
-   * Used to determin if updates can be retried. Also, mutations to this field do not trigger
+   * Used to determine if updates can be retried. Also, mutations to this field do not trigger
    * objects in the session cache to be evicted.
    *
    * @return