diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index a8a8828f6..222b38877 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -275,7 +275,6 @@ class ClassMetadata extends ClassMetadataInfo
     {
         // This metadata is always serialized/cached.
         $serialized = array(
-            'namedQueries',
             'associationMappings',
             'columnNames', //TODO: Not really needed. Can use fieldMappings[$fieldName]['columnName']
             'fieldMappings',
@@ -331,6 +330,10 @@ class ClassMetadata extends ClassMetadataInfo
             $serialized[] = 'lifecycleCallbacks';
         }
 
+        if ($this->namedQueries) {
+            $serialized[] = 'namedQueries';
+        }
+
         return $serialized;
     }