--- a/Framework/Toolbox/ParsedDicomCache.h	Fri Nov 15 12:38:15 2019 +0100
+++ b/Framework/Toolbox/ParsedDicomCache.h	Fri Nov 15 17:34:19 2019 +0100
@@ -30,6 +30,9 @@
   {
   private:
     class Item;
+
+    static std::string GetIndex(unsigned int bucket,
+                                const std::string& bucketKey);
     
     Orthanc::MemoryObjectCache  cache_;
 
@@ -39,12 +42,14 @@
       cache_.SetMaximumSize(size);
     }
 
-    void Invalidate(const std::string& key)
+    void Invalidate(unsigned int bucket,
+                    const std::string& bucketKey)
     {
-      cache_.Invalidate(key);
+      cache_.Invalidate(GetIndex(bucket, bucketKey));
     }
     
-    void Acquire(const std::string& key,
+    void Acquire(unsigned int bucket,
+                 const std::string& bucketKey,
                  Orthanc::ParsedDicomFile* dicom,
                  size_t fileSize,
                  bool hasPixelData);
@@ -57,7 +62,8 @@
 
     public:
       Reader(ParsedDicomCache& cache,
-             const std::string& key);
+             unsigned int bucket,
+             const std::string& bucketKey);
 
       bool IsValid() const
       {