1 files changed, 11 insertions, 1 deletions
diff --git a/lib/gitlab/github_import/user_finder.rb b/lib/gitlab/github_import/user_finder.rb
index f583ef39d13..93483ee697a 100644
--- a/lib/gitlab/github_import/user_finder.rb
+++ b/lib/gitlab/github_import/user_finder.rb
@@ -106,7 +106,7 @@ module Gitlab
 
         unless email
           user = client.user(username)
-          email = Gitlab::Cache::Import::Caching.write(cache_key, user.email) if user
+          email = Gitlab::Cache::Import::Caching.write(cache_key, user.email, timeout: timeout(user.email)) if user
         end
 
         email
@@ -171,6 +171,16 @@ module Gitlab
         # which we couldn't find an ID.
         [exists, number > 0 ? number : nil]
       end
+
+      private
+
+      def timeout(email)
+        if email
+          Gitlab::Cache::Import::Caching::TIMEOUT
+        else
+          Gitlab::Cache::Import::Caching::SHORTER_TIMEOUT
+        end
+      end
     end
   end
 end