diff --git a/impl/src/main/java/org/jboss/weld/interceptor/builder/InterceptionModelBuilder.java b/impl/src/main/java/org/jboss/weld/interceptor/builder/InterceptionModelBuilder.java
index 082c6a141e6..4d710b4ff21 100644
--- a/impl/src/main/java/org/jboss/weld/interceptor/builder/InterceptionModelBuilder.java
+++ b/impl/src/main/java/org/jboss/weld/interceptor/builder/InterceptionModelBuilder.java
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.EnumMap;
 
 import org.jboss.weld.interceptor.reader.TargetClassInterceptorMetadata;
 import org.jboss.weld.interceptor.spi.metadata.InterceptorClassMetadata;
@@ -50,9 +51,9 @@ public class InterceptionModelBuilder {
 
     private final Set<InterceptorClassMetadata<?>> allInterceptors = new LinkedHashSet<InterceptorClassMetadata<?>>();
 
-    private final Map<InterceptionType, List<InterceptorClassMetadata<?>>> globalInterceptors = new HashMap<InterceptionType, List<InterceptorClassMetadata<?>>>();
+    private final Map<InterceptionType, List<InterceptorClassMetadata<?>>> globalInterceptors = new EnumMap<InterceptionType, List<InterceptorClassMetadata<?>>>(InterceptionType.class);
 
-    private final Map<InterceptionType, Map<Method, List<InterceptorClassMetadata<?>>>> methodBoundInterceptors = new HashMap<InterceptionType, Map<Method, List<InterceptorClassMetadata<?>>>>();
+    private final Map<InterceptionType, Map<Method, List<InterceptorClassMetadata<?>>>> methodBoundInterceptors = new EnumMap<InterceptionType, Map<Method, List<InterceptorClassMetadata<?>>>>(InterceptionType.class);
 
     private TargetClassInterceptorMetadata targetClassInterceptorMetadata;