Do not store Persistent object in Component registry cache.

(cherry picked from commit e7967448c588f4b5743dfca28d9be3ab47ba05c9)

Conflicts:
	product/ERP5Type/dynamic/component_package.py

product/ERP5Type/dynamic/component_package.py

@@ -114,14 +114,14 @@ class ComponentDynamicPackage(ModuleType):
           except AttributeError:
             # XXX: Accessors may have not been generated yet
             pass
-
-          if validation_state_tuple in ('modified', 'validated'):
-            version = component.getVersion(validated_only=True)
-            # The versions should have always been set on ERP5Site property
-            # beforehand
-            if version in version_priority_set:
-              reference = component.getReference(validated_only=True)
-              self.__registry_dict.setdefault(reference, {})[version] = component.getId()
+          else:
+            if validation_state_tuple in ('modified', 'validated'):
+              version = component.getVersion(validated_only=True)
+              # The versions should have always been set on ERP5Site property
+              # beforehand
+              if version in version_priority_set:
+                reference = component.getReference(validated_only=True)
+                self.__registry_dict.setdefault(reference, {})[version] = component.getId()
 
     return self.__registry_dict