diff --git a/java/src/main/java/org/msgpack/template/TemplateRegistry.java b/java/src/main/java/org/msgpack/template/TemplateRegistry.java
index ef377efa..a3fe1dff 100644
--- a/java/src/main/java/org/msgpack/template/TemplateRegistry.java
+++ b/java/src/main/java/org/msgpack/template/TemplateRegistry.java
@@ -112,7 +112,9 @@ public class TemplateRegistry {
 
 		Class<?> tmplClass = TemplateBuilder.load(target);
 		if (tmplClass != null) {
-			return TemplateBuilder.initialize(target, tmplClass);
+			tmpl = TemplateBuilder.initialize(target, tmplClass);
+			register(target, tmpl);
+			return tmpl;
 		}
 
 		if(target.isArray()) {