diff --git a/tools/disk_cache/implementation.go b/tools/disk_cache/implementation.go
index 910c6b647..555f9c1b1 100644
--- a/tools/disk_cache/implementation.go
+++ b/tools/disk_cache/implementation.go
@@ -292,7 +292,10 @@ func (dc *DiskCache) add(key string, items map[string][]byte) (err error) {
 		}
 		if len(data) == 0 {
 			if err = os.Remove(p); err != nil {
-				return
+				if !os.IsNotExist(err) {
+					return
+				}
+				err = nil
 			}
 			changed -= before
 		} else {