diff --git a/polkadot/node/core/av-store/src/lib.rs b/polkadot/node/core/av-store/src/lib.rs
index 27973921d2..4905535a21 100644
--- a/polkadot/node/core/av-store/src/lib.rs
+++ b/polkadot/node/core/av-store/src/lib.rs
@@ -1000,9 +1000,7 @@ fn store_chunks(
 		);
 	}
 
-	for chunk in chunks {
-		subsystem.chunks_cache.entry(*candidate_hash).or_default().insert(chunk.index, chunk.clone());
-
+	for chunk in &chunks {
 		let pruning_record = ChunkPruningRecord {
 			candidate_hash: candidate_hash.clone(),
 			block_number,
@@ -1024,6 +1022,8 @@ fn store_chunks(
 		);
 	}
 
+	subsystem.chunks_cache.entry(*candidate_hash).or_default().extend(chunks.into_iter().map(|c| (c.index, c)));
+
 	tx.put_vec(
 		columns::META,
 		&CHUNK_PRUNING_KEY,