diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java
index 041e03a57866b4ff7062c656733cf91e2c0f4759..f2bc5a997b4112a6f7cae7bb1a7a02fee83c106d 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java
@@ -212,6 +212,11 @@ public class PathInfoDatabaseFeedingTask implements IMaintenanceTask, IPostRegis
         operationLog.info("Feeding finished.");
     }
     
+    @Override
+    public void clearCache()
+    {
+    }
+
     private List<SimpleDataSetInformationDTO> filteredDataSets(List<SimpleDataSetInformationDTO> dataSets, Set<String> processedDataSets)
     {
         List<SimpleDataSetInformationDTO> result = new ArrayList<>();
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTask.java
index 78fb8924a9b27ce43be55ed6425eafb0e12ada2e..15c31fa89135432b829c10293872807a5579429c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTask.java
@@ -35,4 +35,9 @@ public abstract class AbstractPostRegistrationTask implements IPostRegistrationT
         this.properties = properties;
         this.service = service;
     }
+
+    @Override
+    public void clearCache()
+    {
+    }
 }
\ No newline at end of file
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java
index bb6b32680921001abc6aaa2e6cc5569c3f87e787..8eec26821dba748c8c08c8eb82d19e35b635bb8d 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java
@@ -183,6 +183,12 @@ public class EagerShufflingTask extends AbstractPostRegistrationTaskForPhysicalD
     private List<Share> shares;
     private Date sharesTimestamp;
 
+    @Override
+    public void clearCache()
+    {
+        sharesTimestamp = null;
+    }
+
     @Override
     public IPostRegistrationTaskExecutor createExecutor(String dataSetCode)
     {
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTask.java
index 628eeb9f9a1cdd0a0712f310c360938e5a663b05..c6a81853f5da96695f5bec9f978d9cd535af8e79 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTask.java
@@ -29,6 +29,11 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
  */
 public interface IPostRegistrationTask
 {
+    /**
+     * Clear potential cache.
+     */
+    public void clearCache();
+    
     /**
      * Returns <code>true</code> if this task needs a lock onto the data store.
      */
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTask.java
index 6f1a5229bfba806eaa9e262c788848e924809e69..e346ec0cc2776141cc57e6ff9cead70aaac5c537 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTask.java
@@ -185,6 +185,7 @@ public class PostRegistrationMaintenanceTask implements IDataStoreLockingMainten
                 for (Entry<String, IPostRegistrationTask> entry : tasks)
                 {
                     IPostRegistrationTask task = entry.getValue();
+                    task.clearCache();
                     String taskName = entry.getKey();
                     executor.execute(task, taskName, code, dataSet.isContainer());
                 }