diff --git a/src/Context/FeatureContext.php b/src/Context/FeatureContext.php
index 8995330b8..4ec3c15a3 100644
--- a/src/Context/FeatureContext.php
+++ b/src/Context/FeatureContext.php
@@ -660,14 +660,6 @@ public static function prepare( BeforeSuiteScope $scope ): void {
 		$result = Process::create( 'wp cli info', null, self::get_process_env_variables() )->run_check();
 		echo "{$result->stdout}\n";
 
-		self::cache_wp_files();
-
-		$result = Process::create( Utils\esc_cmd( 'wp core version --debug --path=%s', self::$cache_dir ), null, self::get_process_env_variables() )->run_check();
-		echo "[Debug messages]\n";
-		echo "{$result->stderr}\n";
-
-		echo "WordPress {$result->stdout}\n";
-
 		// Remove install cache if any (not setting the static var).
 		$wp_version        = getenv( 'WP_VERSION' );
 		$wp_version_suffix = ( false !== $wp_version ) ? "-$wp_version" : '';
@@ -1298,6 +1290,16 @@ public function add_line_to_wp_config( &$wp_config_code, $line ): void {
 	 * @param string $subdir
 	 */
 	public function download_wp( $subdir = '' ): void {
+		if ( ! self::$cache_dir ) {
+			self::cache_wp_files();
+
+			$result = Process::create( Utils\esc_cmd( 'wp core version --debug --path=%s', self::$cache_dir ), null, self::get_process_env_variables() )->run_check();
+			echo "[Debug messages]\n";
+			echo "{$result->stderr}\n";
+
+			echo "WordPress {$result->stdout}\n";
+		}
+
 		$dest_dir = $this->variables['RUN_DIR'] . "/$subdir";
 
 		if ( $subdir ) {