diff --git a/src/system/kernel/team.c b/src/system/kernel/team.c
index e518048c4b..02aab1092a 100644
--- a/src/system/kernel/team.c
+++ b/src/system/kernel/team.c
@@ -898,6 +898,7 @@ team_create_thread_start(void *args)
 
 	t = thread_get_current_thread();
 	team = t->team;
+	cache_node_launched(teamArgs->arg_count, teamArgs->args);
 
 	TRACE(("team_create_thread_start: entry thread %ld\n", t->id));
 
@@ -1020,7 +1021,7 @@ load_image_etc(int32 argCount, char **args, int32 envCount, char **env,
 	struct team *team, *parent;
 	const char *threadName;
 	thread_id thread;
-	int err;
+	status_t err;
 	cpu_status state;
 	struct team_arg *teamArgs;
 	struct team_loading_info loadingInfo;
@@ -1074,8 +1075,6 @@ load_image_etc(int32 argCount, char **args, int32 envCount, char **env,
 	if (err < B_OK)
 		goto err3;
 
-	cache_node_launched(argCount, args);
-
 	// cut the path from the main thread name
 	threadName = strrchr(args[0], '/');
 	if (threadName != NULL)
@@ -1228,8 +1227,6 @@ exec_team(int32 argCount, char **args, int32 envCount, char **env)
 	remove_images(team);
 	vfs_exec_io_context(team->io_context);
 
-	cache_node_launched(argCount, args);
-
 	user_debug_finish_after_exec();
 
 	// rename the team