diff --git a/src/org/labkey/test/components/Component.java b/src/org/labkey/test/components/Component.java
index 386ed6f99a..11a1b5057d 100644
--- a/src/org/labkey/test/components/Component.java
+++ b/src/org/labkey/test/components/Component.java
@@ -73,7 +73,12 @@ protected EC elementCache()
 
             _elementCache = Objects.requireNonNull(newElementCache());
             waitForReady();
-            Objects.requireNonNull(_elementCache, "waitForReady() cleared the element cache");
+            if (_elementCache == null)
+            {
+                // waitForReady triggered a cache clear -- either explicitly or due to a refind.
+                // It succeeded, so it should be safe to get a fresh `newElementCache`
+                _elementCache = Objects.requireNonNull(newElementCache());
+            }
         }
         return _elementCache;
     }