diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/CacheOptions.java b/src/main/java/com/avaje/ebeaninternal/server/core/CacheOptions.java
index 1eed47deb..cb31f5c70 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/CacheOptions.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/CacheOptions.java
@@ -83,9 +83,7 @@ public class CacheOptions {
    * Set the natural key property.
    */
   public void setNaturalKey(String naturalKey) {
-    if (naturalKey == null || naturalKey.length() == 0) {
-      naturalKey = null;
-    } else {
+    if (naturalKey != null && naturalKey.length() != 0) {
       this.naturalKey = naturalKey.trim();
     }
   }