diff --git a/app/ocache/ocache.go b/app/ocache/ocache.go
index 31852286..7132d43d 100644
--- a/app/ocache/ocache.go
+++ b/app/ocache/ocache.go
@@ -176,8 +176,12 @@ Load:
 	}
 	c.mu.Unlock()
 	if closing {
-		<-e.close
-		goto Load
+		select {
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		case <-e.close:
+			goto Load
+		}
 	}
 
 	if load {