diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCache.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCache.java
index 7580ab2c1a728e18be769c33315b4ce4aaef4653..164b4fddad4d5fe25e491772d09b2868166acfcb 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCache.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCache.java
@@ -199,7 +199,14 @@ public class ContentCache implements IContentCache, InitializingBean
         {
             return 0;
         }
-        Arrays.asList(dataSetFolders);
+        Arrays.asList(dataSetFolders, new Comparator<File>()
+            {
+                @Override
+                public int compare(File f1, File f2)
+                {
+                    return f1.getName().compareTo(f2.getName());
+                }
+            });
         boolean cachedFilesRemoved = false;
         for (File dataSetFolder : dataSetFolders)
         {