Fixed CDC after async and component lifecycle changes