diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Templates.java b/querydsl-core/src/main/java/com/mysema/query/types/Templates.java
index 8db75d445..d4ab81374 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/Templates.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/Templates.java
@@ -13,7 +13,7 @@
  */
 package com.mysema.query.types;
 
-import java.util.IdentityHashMap;
+import java.util.HashMap;
 import java.util.Map;
 
 import javax.annotation.Nullable;
@@ -27,9 +27,9 @@ public class Templates {
 
     public static final Templates DEFAULT = new Templates();
 
-    private final Map<Operator<?>, Template> templates = new IdentityHashMap<Operator<?>, Template>();
+    private final Map<Operator<?>, Template> templates = new HashMap<Operator<?>, Template>();
 
-    private final Map<Operator<?>, Integer> precedence = new IdentityHashMap<Operator<?>, Integer>();
+    private final Map<Operator<?>, Integer> precedence = new HashMap<Operator<?>, Integer>();
 
     private final TemplateFactory templateFactory;