Refactor introspection mechanism to correctly update stored entities when introspecting multiple modules.

In the current implementation checks for validation are done per module (eg. portlets) so only the entities valid for the last introspected module will be stored.