diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 0eee7366775..b5e61724ede 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -100,6 +100,7 @@ void WriteBufferFromS3::nextImpl()
 
         auto cache_key = cache->hash(blob_name);
         auto file_segments_holder = cache->setDownloading(cache_key, current_download_offset, size);
+        current_download_offset += size;
 
         size_t remaining_size = size;
         for (const auto & file_segment : file_segments_holder.file_segments)
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 2125f515734..f1b4fe1a588 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -49,7 +49,6 @@ ln -sf $SRC_PATH/users.d/session_log_test.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/memory_profiler.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/no_fsync_metadata.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/filelog.xml $DEST_SERVER_PATH/users.d/
-ln -sf $SRC_PATH/users.d/s3_cache.xml $DEST_SERVER_PATH/s3_cache/
 
 # FIXME DataPartsExchange may hang for http_send_timeout seconds
 # when nobody is going to read from the other side of socket (due to "Fetching of part was cancelled"),
@@ -86,6 +85,7 @@ fi
 
 if [[ -n "$EXPORT_S3_STORAGE_POLICIES" ]]; then
     ln -sf $SRC_PATH/config.d/storage_conf.xml $DEST_SERVER_PATH/config.d/
+    ln -sf $SRC_PATH/users.d/s3_cache.xml $DEST_SERVER_PATH/s3_cache/
 fi
 
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
diff --git a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference b/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference
index e83b5551821..5bc18d48655 100644
--- a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference
+++ b/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference
@@ -9,7 +9,7 @@ SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, re
 0
 SELECT count() FROM system.filesystem_cache;
 0
-INSERT INTO test SELECT number, toString(number) FROM numbers(100) SETTINGS enable_filesystem_cache_on_write_operations=1;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
 SELECT file_segment_range_begin, file_segment_range_end, size, state FROM (SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path) WHERE endsWith(local_path, 'data.bin') FORMAT Vertical;
 Row 1:
 ──────
@@ -60,3 +60,16 @@ SET mutations_sync=2;
 ALTER TABLE test UPDATE value = 'kek' WHERE key = 100;
 SELECT count() FROM system.filesystem_cache;
 28
+INSERT INTO test SELECT number, toString(number) FROM numbers(5000000);
+SYSTEM FLUSH LOGS;
+SELECT query, ProfileEvents['RemoteFSReadBytes'] > 0 as remote_fs_read
+FROM system.query_log
+WHERE query LIKE 'SELECT number, toString(number) FROM numbers(5000000)%'
+AND type = 'QueryFinish'
+AND current_database = currentDatabase()
+ORDER BY query_start_time DESC
+LIMIT 1;
+SELECT count() FROM test;
+5010500
+SELECT count() FROM test WHERE value LIKE '%010%';
+18816
diff --git a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql b/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql
index 745af904c5f..946e72ba2fd 100644
--- a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql
+++ b/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql
@@ -13,7 +13,7 @@ SELECT file_segment_range_begin, file_segment_range_end, size, state FROM (SELEC
 SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
 SELECT count() FROM system.filesystem_cache;
 
-INSERT INTO test SELECT number, toString(number) FROM numbers(100) SETTINGS enable_filesystem_cache_on_write_operations=1;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
 
 SELECT file_segment_range_begin, file_segment_range_end, size, state FROM (SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path) WHERE endsWith(local_path, 'data.bin') FORMAT Vertical;
 SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
@@ -50,3 +50,15 @@ SELECT count() FROM system.filesystem_cache;
 SET mutations_sync=2;
 ALTER TABLE test UPDATE value = 'kek' WHERE key = 100;
 SELECT count() FROM system.filesystem_cache;
+
+INSERT INTO test SELECT number, toString(number) FROM numbers(5000000);
+SYSTEM FLUSH LOGS;
+SELECT query, ProfileEvents['RemoteFSReadBytes'] > 0 as remote_fs_read
+FROM system.query_log
+WHERE query LIKE 'SELECT number, toString(number) FROM numbers(5000000)%'
+AND type = 'QueryFinish'
+AND current_database = currentDatabase()
+ORDER BY query_start_time DESC
+LIMIT 1;
+SELECT count() FROM test;
+SELECT count() FROM test WHERE value LIKE '%010%';