diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 18091983f59ddde8105e566545a0d9e4a12a4f1c..1545d966571dc86b54c98f888a0e6451501f8c81 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-3.4.0
+3.5.0
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 5ab6cd5a4ef9ba491b9249abcc286d545bb93332..ce6d0422c1f8d1925570e6d43eb2b9ece6f027ef 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -97,6 +97,9 @@ module Gitlab
           )
         end
 
+        # If present DisableCache must be a Boolean. Otherwise workhorse ignores it.
+        params['DisableCache'] = true if git_archive_cache_disabled?
+
         [
           SEND_DATA_HEADER,
           "git-archive:#{encode(params)}"
@@ -244,6 +247,10 @@ module Gitlab
           right_commit_id: diff_refs.head_sha
         }
       end
+
+      def git_archive_cache_disabled?
+        ENV['WORKHORSE_ARCHIVE_CACHE_DISABLED'].present? || Feature.enabled?(:workhorse_archive_cache_disabled)
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index 249c77dc636d8a474ecb0e200002e991c5ed33b9..2e7a0265a0bcf173010542d0e613579b85083d6b 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -26,11 +26,16 @@ describe Gitlab::Workhorse do
         'GitalyRepository' => repository.gitaly_repository.to_h.deep_stringify_keys
       )
     end
+    let(:cache_disabled) { false }
 
     subject do
       described_class.send_git_archive(repository, ref: ref, format: format)
     end
 
+    before do
+      allow(described_class).to receive(:git_archive_cache_disabled?).and_return(cache_disabled)
+    end
+
     context 'when Gitaly workhorse_archive feature is enabled' do
       it 'sets the header correctly' do
         key, command, params = decode_workhorse_header(subject)
@@ -39,6 +44,15 @@ describe Gitlab::Workhorse do
         expect(command).to eq('git-archive')
         expect(params).to include(gitaly_params)
       end
+
+      context 'when archive caching is disabled' do
+        let(:cache_disabled) { true }
+
+        it 'tells workhorse not to use the cache' do
+          _, _, params = decode_workhorse_header(subject)
+          expect(params).to include({ 'DisableCache' => true })
+        end
+      end
     end
 
     context 'when Gitaly workhorse_archive feature is disabled', :skip_gitaly_mock do