Fix caching embeded data
Rename AppDefinition => ComponentDefinition