diff --git a/src/main/java/org/nustaq/serialization/coders/FSTStreamDecoder.java b/src/main/java/org/nustaq/serialization/coders/FSTStreamDecoder.java
index bde0f9dc..bb4357ea 100644
--- a/src/main/java/org/nustaq/serialization/coders/FSTStreamDecoder.java
+++ b/src/main/java/org/nustaq/serialization/coders/FSTStreamDecoder.java
@@ -39,23 +39,13 @@ public class FSTStreamDecoder implements FSTDecoder {
 
     public FSTStreamDecoder(FSTConfiguration conf) {
         this.conf = conf;
-        clnames = (FSTClazzNameRegistry) conf.getCachedObject(FSTClazzNameRegistry.class);
-        if (clnames == null) {
-            clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
-        } else {
-            clnames.clear();
-        }
+        clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
     }
 
     @Override
     public void setConf(FSTConfiguration conf) {
         this.conf = conf;
-        clnames = (FSTClazzNameRegistry) conf.getCachedObject(FSTClazzNameRegistry.class);
-        if (clnames == null) {
-            clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
-        } else {
-            clnames.clear();
-        }
+        clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
     }
 
     public int ensureReadAhead(int bytes) {
diff --git a/src/main/java/org/nustaq/serialization/coders/FSTStreamEncoder.java b/src/main/java/org/nustaq/serialization/coders/FSTStreamEncoder.java
index 521f89bd..4bb0eb15 100644
--- a/src/main/java/org/nustaq/serialization/coders/FSTStreamEncoder.java
+++ b/src/main/java/org/nustaq/serialization/coders/FSTStreamEncoder.java
@@ -35,23 +35,13 @@ public class FSTStreamEncoder implements FSTEncoder {
 
     public FSTStreamEncoder(FSTConfiguration conf) {
         this.conf = conf;
-        clnames = (FSTClazzNameRegistry) conf.getCachedObject(FSTClazzNameRegistry.class);
-        if ( clnames == null ) {
-            clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
-        } else {
-            clnames.clear();
-        }
+        clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
     }
 
     @Override
     public void setConf(FSTConfiguration conf) {
         this.conf = conf;
-        clnames = (FSTClazzNameRegistry) conf.getCachedObject(FSTClazzNameRegistry.class);
-        if ( clnames == null ) {
-            clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
-        } else {
-            clnames.clear();
-        }
+        clnames = new FSTClazzNameRegistry(conf.getClassRegistry());
     }
 
     void writeFBooleanArr(boolean[] arr, int off, int len) throws IOException {