diff --git a/src/cargo/sources/registry/remote.rs b/src/cargo/sources/registry/remote.rs
index e5f506bfca3..b9283b819e6 100644
--- a/src/cargo/sources/registry/remote.rs
+++ b/src/cargo/sources/registry/remote.rs
@@ -32,7 +32,6 @@ pub struct RemoteRegistry<'cfg> {
     head: Cell<Option<git2::Oid>>,
     current_sha: Cell<Option<InternedString>>,
     needs_update: bool, // Does this registry need to be updated?
-    updated: bool,      // Has this registry been updated this session?
 }
 
 impl<'cfg> RemoteRegistry<'cfg> {
@@ -49,7 +48,6 @@ impl<'cfg> RemoteRegistry<'cfg> {
             head: Cell::new(None),
             current_sha: Cell::new(None),
             needs_update: false,
-            updated: false,
         }
     }
 
@@ -141,6 +139,14 @@ impl<'cfg> RemoteRegistry<'cfg> {
         self.current_sha.set(Some(sha));
         Some(sha)
     }
+
+    fn is_updated(&self) -> bool {
+        self.config.updated_sources().contains(&self.source_id)
+    }
+
+    fn mark_updated(&self) {
+        self.config.updated_sources().insert(self.source_id);
+    }
 }
 
 const LAST_UPDATED_FILE: &str = ".last-updated";
@@ -214,7 +220,7 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> {
 
         match load_helper(&self, path, index_version) {
             Ok(result) => Poll::Ready(Ok(result)),
-            Err(_) if !self.updated => {
+            Err(_) if !self.is_updated() => {
                 // If git returns an error and we haven't updated the repo, return
                 // pending to allow an update to try again.
                 self.needs_update = true;
@@ -250,19 +256,20 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> {
             return Ok(());
         }
 
-        self.updated = true;
         self.needs_update = false;
 
-        if self.config.offline() {
+        // Make sure the index is only updated once per session since it is an
+        // expensive operation. This generally only happens when the resolver
+        // is run multiple times, such as during `cargo publish`.
+        if self.is_updated() {
             return Ok(());
         }
-        if self.config.cli_unstable().no_index_update {
+        self.mark_updated();
+
+        if self.config.offline() {
             return Ok(());
         }
-        // Make sure the index is only updated once per session since it is an
-        // expensive operation. This generally only happens when the resolver
-        // is run multiple times, such as during `cargo publish`.
-        if self.config.updated_sources().contains(&self.source_id) {
+        if self.config.cli_unstable().no_index_update {
             return Ok(());
         }
 
@@ -291,7 +298,6 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> {
         let repo = self.repo.borrow_mut().unwrap();
         git::fetch(repo, url.as_str(), &self.index_git_ref, self.config)
             .with_context(|| format!("failed to fetch `{}`", url))?;
-        self.config.updated_sources().insert(self.source_id);
 
         // Create a dummy file to record the mtime for when we updated the
         // index.
@@ -301,13 +307,12 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> {
     }
 
     fn invalidate_cache(&mut self) {
-        if !self.updated {
-            self.needs_update = true;
-        }
+        // To fully invalidate, undo `mark_updated`s work
+        self.needs_update = true;
     }
 
     fn is_updated(&self) -> bool {
-        self.updated
+        self.is_updated()
     }
 
     fn download(&mut self, pkg: PackageId, checksum: &str) -> CargoResult<MaybeLock> {