diff --git a/src/template/ast/Attributes.tt b/src/template/ast/Attributes.tt
index ec0f76f5e0b555b8a4ce8569b5a4ae0ca31ac257..c11c9d3c217f3beb70233470a7d0d020735683c6 100644
--- a/src/template/ast/Attributes.tt
+++ b/src/template/ast/Attributes.tt
@@ -39,7 +39,23 @@ $endif
 ]]
 
 AttrDecl.cacheDeclarations [[
-$if(!#isParameterized)
+$if(#isParameterized)
+  $if(#declaredNTA)
+  /** @apilevel internal */
+  protected $ASTNode #(signature)_proxy;
+  $endif
+  $if(LazyMaps)
+  /** @apilevel internal */
+  protected $DefaultMapType #(signature)_values;
+  $else
+  /** @apilevel internal */
+  protected $DefaultMapType #(signature)_values = $CreateDefaultMap;
+  $endif
+  $if(!#simpleCacheCheck)
+  /** @apilevel internal */
+  protected $DefaultMapType #(signature)_computed;
+  $endif
+$else
   /** @apilevel internal */
   $if(#simpleCacheCheck)
   protected boolean #(signature)_computed = false;
@@ -49,25 +65,9 @@ $if(!#isParameterized)
 
   /** @apilevel internal */
   protected #getType #(signature)_value;
-$if(#isCircular)
+  $if(#isCircular)
   /** @apilevel internal */
   protected boolean #(signature)_initialized = false;
-$endif
-$else
-$if(#declaredNTA)
-  /** @apilevel internal */
-  protected $ASTNode #(signature)_proxy;
-$endif
-$if(LazyMaps)
-  /** @apilevel internal */
-  protected $DefaultMapType #(signature)_values;
-$else
-  /** @apilevel internal */
-  protected $DefaultMapType #(signature)_values = $CreateDefaultMap;
-$endif
-  $if(!#simpleCacheCheck)
-  /** @apilevel internal */
-  protected $DefaultMapType #(signature)_computed;
   $endif
 $endif
 ]]