From 5538699f547f28bbb8ea686a2662017a232d3251 Mon Sep 17 00:00:00 2001
From: Matti Kortelainen <matti.kortelainen@cern.ch>
Date: Tue, 5 Oct 2021 19:48:56 +0200
Subject: [PATCH] Throw exception from deprecated EventSetupRecord::get()

Remove all tests of the deprecated API for which tests for the new API
exist, and migrate the rest.
---
 FWCore/Framework/interface/Callback.h         |   4 +-
 .../Framework/interface/DataProxyTemplate.h   |   2 +-
 .../interface/DependentRecordImplementation.h |  14 +-
 .../Framework/interface/ESConsumesCollector.h |   4 +
 FWCore/Framework/interface/EventSetup.h       |  19 +-
 FWCore/Framework/interface/EventSetupRecord.h |  49 +--
 .../interface/stream/EDAnalyzerAdaptor.h      |  12 +-
 .../interface/stream/ProducingModuleAdaptor.h |  12 +-
 FWCore/Framework/src/EDAnalyzer.cc            |  12 +-
 FWCore/Framework/src/EDFilter.cc              |  21 +-
 FWCore/Framework/src/EDLooperBase.cc          |  21 +-
 FWCore/Framework/src/EDProducer.cc            |  12 +-
 FWCore/Framework/src/EventSetupRecord.cc      |   4 +-
 FWCore/Framework/src/global/EDAnalyzerBase.cc |  32 +-
 FWCore/Framework/src/global/EDFilterBase.cc   |  34 +-
 FWCore/Framework/src/global/EDProducerBase.cc |  39 +-
 .../Framework/src/limited/EDAnalyzerBase.cc   |  32 +-
 FWCore/Framework/src/limited/EDFilterBase.cc  |  32 +-
 .../Framework/src/limited/EDProducerBase.cc   |  32 +-
 FWCore/Framework/src/one/EDAnalyzerBase.cc    |  17 +-
 FWCore/Framework/src/one/EDFilterBase.cc      |  17 +-
 FWCore/Framework/src/one/EDProducerBase.cc    |  17 +-
 .../src/stream/EDAnalyzerAdaptorBase.cc       |  17 +-
 .../src/stream/EDFilterAdaptorBase.cc         |   4 +-
 .../src/stream/EDProducerAdaptorBase.cc       |   4 +-
 .../src/stream/ProducingModuleAdaptorBase.cc  |  20 +-
 FWCore/Framework/test/callback_t.cppunit.cc   |   3 +-
 .../test/dependentrecord_t.cppunit.cc         | 114 +++---
 FWCore/Framework/test/esproducer_t.cppunit.cc | 145 +++++--
 FWCore/Framework/test/eventsetup_t.cppunit.cc | 365 +++++++-----------
 .../test/eventsetuprecord_t.cppunit.cc        | 144 +++----
 FWCore/Framework/test/fullchain_t.cppunit.cc  |  41 +-
 .../test/run_test_1_thread_es_prefetching.sh  |   2 -
 .../test/stubs/TestESDummyDataAnalyzer.cc     |  24 --
 .../test_1_thread_es_mixed_prefetch_cfg.py    |  30 --
 .../test/test_1_thread_es_no_prefetch_cfg.py  |  27 --
 36 files changed, 537 insertions(+), 841 deletions(-)
 delete mode 100644 FWCore/Framework/test/test_1_thread_es_mixed_prefetch_cfg.py
 delete mode 100644 FWCore/Framework/test/test_1_thread_es_no_prefetch_cfg.py

diff --git a/FWCore/Framework/interface/Callback.h b/FWCore/Framework/interface/Callback.h
index a584e3d9046f9..3c7751419e6d0 100644
--- a/FWCore/Framework/interface/Callback.h
+++ b/FWCore/Framework/interface/Callback.h
@@ -166,7 +166,7 @@ namespace edm {
         //Handle mayGets
         TRecord rec;
         edm::ESParentContext pc{&callingContext_};
-        rec.setImpl(iRecord, transitionID(), getTokenIndices(), iEventSetupImpl, &pc, true);
+        rec.setImpl(iRecord, transitionID(), getTokenIndices(), iEventSetupImpl, &pc);
         postMayGetProxies_ = producer_->updateFromMayConsumes(id_, rec);
         return static_cast<bool>(postMayGetProxies_);
       }
@@ -194,7 +194,7 @@ namespace edm {
               }
               TRecord rec;
               edm::ESParentContext pc{&callingContext_};
-              rec.setImpl(iRecord, transitionID(), proxies, iEventSetupImpl, &pc, true);
+              rec.setImpl(iRecord, transitionID(), proxies, iEventSetupImpl, &pc);
               ServiceRegistry::Operate operate(weakToken.lock());
               iRecord->activityRegistry()->preESModuleSignal_.emit(iRecord->key(), callingContext_);
               struct EndGuard {
diff --git a/FWCore/Framework/interface/DataProxyTemplate.h b/FWCore/Framework/interface/DataProxyTemplate.h
index c930ece872f69..96666a98fd662 100644
--- a/FWCore/Framework/interface/DataProxyTemplate.h
+++ b/FWCore/Framework/interface/DataProxyTemplate.h
@@ -72,7 +72,7 @@ namespace edm {
           iTask.group()->run([this, &iRecord, iKey, iEventSetupImpl, iToken, iParent]() {
             try {
               RecordT rec;
-              rec.setImpl(&iRecord, std::numeric_limits<unsigned int>::max(), nullptr, iEventSetupImpl, &iParent, true);
+              rec.setImpl(&iRecord, std::numeric_limits<unsigned int>::max(), nullptr, iEventSetupImpl, &iParent);
               ServiceRegistry::Operate operate(iToken);
               this->make(rec, iKey);
             } catch (...) {
diff --git a/FWCore/Framework/interface/DependentRecordImplementation.h b/FWCore/Framework/interface/DependentRecordImplementation.h
index e9ba823a16417..0a0b7db2d5446 100644
--- a/FWCore/Framework/interface/DependentRecordImplementation.h
+++ b/FWCore/Framework/interface/DependentRecordImplementation.h
@@ -53,11 +53,8 @@ namespace edm {
             (list_type::template contains<DepRecordT>()),
             "Trying to get a Record from another Record where the second Record is not dependent on the first Record.");
         try {
-          EventSetup const eventSetupT{this->eventSetup(),
-                                       this->transitionID(),
-                                       this->getTokenIndices(),
-                                       *this->esParentContext(),
-                                       this->requireTokens()};
+          EventSetup const eventSetupT{
+              this->eventSetup(), this->transitionID(), this->getTokenIndices(), *this->esParentContext()};
           return eventSetupT.get<DepRecordT>();
         } catch (cms::Exception& e) {
           std::ostringstream sstrm;
@@ -73,11 +70,8 @@ namespace edm {
         static_assert(
             (list_type::template contains<DepRecordT>()),
             "Trying to get a Record from another Record where the second Record is not dependent on the first Record.");
-        EventSetup const eventSetupT{this->eventSetup(),
-                                     this->transitionID(),
-                                     this->getTokenIndices(),
-                                     *this->esParentContext(),
-                                     this->requireTokens()};
+        EventSetup const eventSetupT{
+            this->eventSetup(), this->transitionID(), this->getTokenIndices(), *this->esParentContext()};
         return eventSetupT.tryToGet<DepRecordT>();
       }
 
diff --git a/FWCore/Framework/interface/ESConsumesCollector.h b/FWCore/Framework/interface/ESConsumesCollector.h
index 2cac15a7fc198..745f498bfbe45 100644
--- a/FWCore/Framework/interface/ESConsumesCollector.h
+++ b/FWCore/Framework/interface/ESConsumesCollector.h
@@ -38,6 +38,9 @@
 
 #include <vector>
 #include <memory>
+
+class testEventsetupRecord;
+
 namespace edm {
   class ESConsumesCollectorAdaptor;
   class ESConsumesCollectorWithTagAdaptor;
@@ -160,6 +163,7 @@ namespace edm {
   private:
     //only ESProducer is allowed to make an instance of this class
     friend class ESProducer;
+    friend class ::testEventsetupRecord;
 
     explicit ESConsumesCollectorT(ESConsumesInfo* const iConsumer, unsigned int iTransitionID)
         : ESConsumesCollector(iConsumer, iTransitionID) {}
diff --git a/FWCore/Framework/interface/EventSetup.h b/FWCore/Framework/interface/EventSetup.h
index 7b2e4b902e7b4..d4f0ac7034b2b 100644
--- a/FWCore/Framework/interface/EventSetup.h
+++ b/FWCore/Framework/interface/EventSetup.h
@@ -65,20 +65,14 @@ namespace edm {
     explicit EventSetup(T const& info,
                         unsigned int iTransitionID,
                         ESProxyIndex const* iGetTokenIndices,
-                        ESParentContext const& iContext,
-                        bool iRequireToken)
-        : EventSetup(info.eventSetupImpl(), iTransitionID, iGetTokenIndices, iContext, iRequireToken) {}
+                        ESParentContext const& iContext)
+        : EventSetup(info.eventSetupImpl(), iTransitionID, iGetTokenIndices, iContext) {}
 
     explicit EventSetup(EventSetupImpl const& iSetup,
                         unsigned int iTransitionID,
                         ESProxyIndex const* iGetTokenIndices,
-                        ESParentContext const& iContext,
-                        bool iRequireToken)
-        : m_setup{iSetup},
-          m_getTokenIndices{iGetTokenIndices},
-          m_context(&iContext),
-          m_id{iTransitionID},
-          m_requireToken(iRequireToken) {}
+                        ESParentContext const& iContext)
+        : m_setup{iSetup}, m_getTokenIndices{iGetTokenIndices}, m_context(&iContext), m_id{iTransitionID} {}
     EventSetup(EventSetup const&) = delete;
     EventSetup& operator=(EventSetup const&) = delete;
 
@@ -99,7 +93,7 @@ namespace edm {
         throw eventsetup::NoRecordException<T>(recordDoesExist(m_setup, eventsetup::EventSetupRecordKey::makeKey<T>()));
       }
       T returnValue;
-      returnValue.setImpl(temp, m_id, m_getTokenIndices, &m_setup, m_context, m_requireToken);
+      returnValue.setImpl(temp, m_id, m_getTokenIndices, &m_setup, m_context);
       return returnValue;
     }
 
@@ -117,7 +111,7 @@ namespace edm {
                                                 eventsetup::EventSetupRecordKey>());
       if (temp != nullptr) {
         T rec;
-        rec.setImpl(temp, m_id, m_getTokenIndices, &m_setup, m_context, m_requireToken);
+        rec.setImpl(temp, m_id, m_getTokenIndices, &m_setup, m_context);
         return rec;
       }
       return std::nullopt;
@@ -198,7 +192,6 @@ namespace edm {
     ESProxyIndex const* m_getTokenIndices;
     ESParentContext const* m_context;
     unsigned int m_id;
-    bool m_requireToken;
   };
 
   // Free functions to retrieve an object from the EventSetup.
diff --git a/FWCore/Framework/interface/EventSetupRecord.h b/FWCore/Framework/interface/EventSetupRecord.h
index d2153b4455aa2..a10f616339104 100644
--- a/FWCore/Framework/interface/EventSetupRecord.h
+++ b/FWCore/Framework/interface/EventSetupRecord.h
@@ -98,14 +98,12 @@ namespace edm {
                    unsigned int transitionID,
                    ESProxyIndex const* getTokenIndices,
                    EventSetupImpl const* iEventSetupImpl,
-                   ESParentContext const* iContext,
-                   bool requireTokens) {
+                   ESParentContext const* iContext) {
         impl_ = iImpl;
         transitionID_ = transitionID;
         getTokenIndices_ = getTokenIndices;
         eventSetupImpl_ = iEventSetupImpl;
         context_ = iContext;
-        requireTokens_ = requireTokens;
       }
 
       template <typename HolderT>
@@ -125,23 +123,8 @@ namespace edm {
 
       template <typename HolderT>
       CMS_DEPRECATED bool get(ESInputTag const& iTag, HolderT& iHolder) const {
-        if UNLIKELY (requireTokens_) {
-          throwCalledGetWithoutToken(heterocontainer::className<typename HolderT::value_type>(), iTag.data().c_str());
-        }
-        typename HolderT::value_type const* value = nullptr;
-        ComponentDescription const* desc = nullptr;
-        std::shared_ptr<ESHandleExceptionFactory> whyFailedFactory;
-        impl_->getImplementation(
-            value, iTag.data().c_str(), desc, iHolder.transientAccessOnly, whyFailedFactory, *context_, eventSetupImpl_);
-
-        if (value) {
-          validate(desc, iTag);
-          iHolder = HolderT(value, desc);
-          return true;
-        } else {
-          iHolder = HolderT(std::move(whyFailedFactory));
-          return false;
-        }
+        throwCalledGetWithoutToken(heterocontainer::className<typename HolderT::value_type>(), iTag.data().c_str());
+        return false;
       }
 
       ///returns false if no data available for key
@@ -241,27 +224,11 @@ namespace edm {
 
       unsigned int transitionID() const { return transitionID_; }
 
-      bool requireTokens() const { return requireTokens_; }
-
     private:
       template <typename HolderT>
       bool deprecated_get(char const* iName, HolderT& iHolder) const {
-        if UNLIKELY (requireTokens_) {
-          throwCalledGetWithoutToken(heterocontainer::className<typename HolderT::value_type>(), iName);
-        }
-        typename HolderT::value_type const* value = nullptr;
-        ComponentDescription const* desc = nullptr;
-        std::shared_ptr<ESHandleExceptionFactory> whyFailedFactory;
-        impl_->getImplementation(
-            value, iName, desc, iHolder.transientAccessOnly, whyFailedFactory, *context_, eventSetupImpl_);
-
-        if (value) {
-          iHolder = HolderT(value, desc);
-          return true;
-        } else {
-          iHolder = HolderT(std::move(whyFailedFactory));
-          return false;
-        }
+        throwCalledGetWithoutToken(heterocontainer::className<typename HolderT::value_type>(), iName);
+        return false;
       }
 
       template <template <typename> typename H, typename T, typename R>
@@ -296,7 +263,6 @@ namespace edm {
       ESProxyIndex const* getTokenIndices_ = nullptr;
       ESParentContext const* context_ = nullptr;
       unsigned int transitionID_ = std::numeric_limits<unsigned int>::max();
-      bool requireTokens_ = false;
     };
 
     class EventSetupRecordGeneric : public EventSetupRecord {
@@ -305,9 +271,8 @@ namespace edm {
                               unsigned int iTransitionID,
                               ESProxyIndex const* getTokenIndices,
                               EventSetupImpl const* eventSetupImpl,
-                              ESParentContext const* context,
-                              bool requireTokens = false) {
-        setImpl(iImpl, iTransitionID, getTokenIndices, eventSetupImpl, context, requireTokens);
+                              ESParentContext const* context) {
+        setImpl(iImpl, iTransitionID, getTokenIndices, eventSetupImpl, context);
       }
 
       EventSetupRecordKey key() const final { return impl()->key(); }
diff --git a/FWCore/Framework/interface/stream/EDAnalyzerAdaptor.h b/FWCore/Framework/interface/stream/EDAnalyzerAdaptor.h
index 1bb532737f2d7..4f5ba798727b8 100644
--- a/FWCore/Framework/interface/stream/EDAnalyzerAdaptor.h
+++ b/FWCore/Framework/interface/stream/EDAnalyzerAdaptor.h
@@ -159,8 +159,7 @@ namespace edm {
           const EventSetup c{info,
                              static_cast<unsigned int>(Transition::BeginRun),
                              this->consumer()->esGetTokenIndices(Transition::BeginRun),
-                             pc,
-                             false};
+                             pc};
           MyGlobalRun::beginRun(cnstR, c, m_global.get(), m_runs[ri]);
           typename T::RunContext rc(m_runs[ri].get(), m_global.get());
           MyGlobalRunSummary::beginRun(cnstR, c, &rc, m_runSummaries[ri]);
@@ -178,8 +177,7 @@ namespace edm {
           const EventSetup c{info,
                              static_cast<unsigned int>(Transition::EndRun),
                              this->consumer()->esGetTokenIndices(Transition::EndRun),
-                             pc,
-                             false};
+                             pc};
           MyGlobalRunSummary::globalEndRun(r, c, &rc, m_runSummaries[ri].get());
           MyGlobalRun::endRun(r, c, &rc);
         }
@@ -198,8 +196,7 @@ namespace edm {
           const EventSetup c{info,
                              static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                              this->consumer()->esGetTokenIndices(Transition::BeginLuminosityBlock),
-                             pc,
-                             false};
+                             pc};
           MyGlobalLuminosityBlock::beginLuminosityBlock(cnstLb, c, &rc, m_lumis[li]);
           typename T::LuminosityBlockContext lc(m_lumis[li].get(), m_runs[ri].get(), m_global.get());
           MyGlobalLuminosityBlockSummary::beginLuminosityBlock(cnstLb, c, &lc, m_lumiSummaries[li]);
@@ -218,8 +215,7 @@ namespace edm {
           const EventSetup c{info,
                              static_cast<unsigned int>(Transition::EndLuminosityBlock),
                              this->consumer()->esGetTokenIndices(Transition::EndLuminosityBlock),
-                             pc,
-                             false};
+                             pc};
           MyGlobalLuminosityBlockSummary::globalEndLuminosityBlock(lb, c, &lc, m_lumiSummaries[li].get());
           MyGlobalLuminosityBlock::endLuminosityBlock(lb, c, &lc);
         }
diff --git a/FWCore/Framework/interface/stream/ProducingModuleAdaptor.h b/FWCore/Framework/interface/stream/ProducingModuleAdaptor.h
index 499691f733430..1d629912c518d 100644
--- a/FWCore/Framework/interface/stream/ProducingModuleAdaptor.h
+++ b/FWCore/Framework/interface/stream/ProducingModuleAdaptor.h
@@ -174,8 +174,7 @@ namespace edm {
           const EventSetup c{info,
                              static_cast<unsigned int>(Transition::BeginRun),
                              this->consumer()->esGetTokenIndices(Transition::BeginRun),
-                             parentC,
-                             false};
+                             parentC};
           MyGlobalRun::beginRun(cnstR, c, m_global.get(), m_runs[ri]);
           typename T::RunContext rc(m_runs[ri].get(), m_global.get());
           MyGlobalRunSummary::beginRun(cnstR, c, &rc, m_runSummaries[ri]);
@@ -199,8 +198,7 @@ namespace edm {
           const EventSetup c{info,
                              static_cast<unsigned int>(Transition::EndRun),
                              this->consumer()->esGetTokenIndices(Transition::EndRun),
-                             parentC,
-                             false};
+                             parentC};
           MyGlobalRunSummary::globalEndRun(r, c, &rc, m_runSummaries[ri].get());
           if constexpr (T::HasAbility::kEndRunProducer) {
             MyEndRunProduce::produce(r, c, &rc, m_runSummaries[ri].get());
@@ -225,8 +223,7 @@ namespace edm {
           const EventSetup c{info,
                              static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                              this->consumer()->esGetTokenIndices(Transition::BeginLuminosityBlock),
-                             parentC,
-                             false};
+                             parentC};
 
           MyGlobalLuminosityBlock::beginLuminosityBlock(cnstLb, c, &rc, m_lumis[li]);
           typename T::LuminosityBlockContext lc(m_lumis[li].get(), m_runs[ri].get(), m_global.get());
@@ -252,8 +249,7 @@ namespace edm {
           const EventSetup c{info,
                              static_cast<unsigned int>(Transition::EndLuminosityBlock),
                              this->consumer()->esGetTokenIndices(Transition::EndLuminosityBlock),
-                             parentC,
-                             false};
+                             parentC};
           MyGlobalLuminosityBlockSummary::globalEndLuminosityBlock(lb, c, &lc, m_lumiSummaries[li].get());
           if constexpr (T::HasAbility::kEndLuminosityBlockProducer) {
             MyEndLuminosityBlockProduce::produce(lb, c, &lc, m_lumiSummaries[li].get());
diff --git a/FWCore/Framework/src/EDAnalyzer.cc b/FWCore/Framework/src/EDAnalyzer.cc
index 83031d6daadbf..b396641247d99 100644
--- a/FWCore/Framework/src/EDAnalyzer.cc
+++ b/FWCore/Framework/src/EDAnalyzer.cc
@@ -36,7 +36,7 @@ namespace edm {
     EventSignalsSentry sentry(act, mcc);
     ESParentContext parentC(mcc);
     const EventSetup c{
-        info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+        info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
     this->analyze(e, c);
     return true;
   }
@@ -55,7 +55,7 @@ namespace edm {
     r.setConsumer(this);
     ESParentContext parentC(mcc);
     const EventSetup c{
-        info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC, false};
+        info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
     this->beginRun(r, c);
     return true;
   }
@@ -65,7 +65,7 @@ namespace edm {
     r.setConsumer(this);
     ESParentContext parentC(mcc);
     const EventSetup c{
-        info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+        info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
     this->endRun(r, c);
     return true;
   }
@@ -77,8 +77,7 @@ namespace edm {
     const EventSetup c{info,
                        static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                        esGetTokenIndices(Transition::BeginLuminosityBlock),
-                       parentC,
-                       false};
+                       parentC};
     this->beginLuminosityBlock(lb, c);
     return true;
   }
@@ -90,8 +89,7 @@ namespace edm {
     const EventSetup c{info,
                        static_cast<unsigned int>(Transition::EndLuminosityBlock),
                        esGetTokenIndices(Transition::EndLuminosityBlock),
-                       parentC,
-                       false};
+                       parentC};
     this->endLuminosityBlock(lb, c);
     return true;
   }
diff --git a/FWCore/Framework/src/EDFilter.cc b/FWCore/Framework/src/EDFilter.cc
index 573d89bd68da4..b48e7e171592b 100644
--- a/FWCore/Framework/src/EDFilter.cc
+++ b/FWCore/Framework/src/EDFilter.cc
@@ -36,8 +36,7 @@ namespace edm {
     ESParentContext parentC(mcc);
     rc = this->filter(
         e,
-        EventSetup{
-            info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false});
+        EventSetup{info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC});
     commit_(e, &previousParentageId_);
     return rc;
   }
@@ -56,12 +55,10 @@ namespace edm {
     r.setConsumer(this);
     Run const& cnstR = r;
     ESParentContext parentC(mcc);
-    this->beginRun(cnstR,
-                   EventSetup{info,
-                              static_cast<unsigned int>(Transition::BeginRun),
-                              esGetTokenIndices(Transition::BeginRun),
-                              parentC,
-                              false});
+    this->beginRun(
+        cnstR,
+        EventSetup{
+            info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC});
     commit_(r);
     return;
   }
@@ -74,7 +71,7 @@ namespace edm {
     this->endRun(
         cnstR,
         EventSetup{
-            info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false});
+            info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC});
     commit_(r);
     return;
   }
@@ -88,8 +85,7 @@ namespace edm {
                                EventSetup{info,
                                           static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                                           esGetTokenIndices(Transition::BeginLuminosityBlock),
-                                          parentC,
-                                          false});
+                                          parentC});
     commit_(lb);
   }
 
@@ -102,8 +98,7 @@ namespace edm {
                              EventSetup{info,
                                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
                                         esGetTokenIndices(Transition::EndLuminosityBlock),
-                                        parentC,
-                                        false});
+                                        parentC});
     commit_(lb);
     return;
   }
diff --git a/FWCore/Framework/src/EDLooperBase.cc b/FWCore/Framework/src/EDLooperBase.cc
index fbe09a4825269..0ceb8330c33d4 100644
--- a/FWCore/Framework/src/EDLooperBase.cc
+++ b/FWCore/Framework/src/EDLooperBase.cc
@@ -64,7 +64,7 @@ namespace edm {
     try {
       ESParentContext parentC(&moduleCallingContext_);
       const EventSetup es{
-          esi, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          esi, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       status = duringLoop(event, es, ioController);
     } catch (cms::Exception& e) {
       e.addContext("Calling the 'duringLoop' method of a looper");
@@ -81,7 +81,7 @@ namespace edm {
   EDLooperBase::Status EDLooperBase::doEndOfLoop(const edm::EventSetupImpl& esi) {
     ESParentContext parentC(&moduleCallingContext_);
     const EventSetup es{
-        esi, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+        esi, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
     return endOfLoop(es, iCounter_);
   }
 
@@ -95,11 +95,8 @@ namespace edm {
 
   void EDLooperBase::beginOfJob(const edm::EventSetupImpl& iImpl) {
     ESParentContext parentC(&moduleCallingContext_);
-    beginOfJob(EventSetup{iImpl,
-                          static_cast<unsigned int>(Transition::BeginRun),
-                          esGetTokenIndices(Transition::BeginRun),
-                          parentC,
-                          false});
+    beginOfJob(EventSetup{
+        iImpl, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC});
   }
   void EDLooperBase::beginOfJob(const edm::EventSetup&) { beginOfJob(); }
   void EDLooperBase::beginOfJob() {}
@@ -119,7 +116,7 @@ namespace edm {
     run.setConsumer(this);
     ESParentContext parentC(&moduleCallingContext_);
     const EventSetup es{
-        iES, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC, false};
+        iES, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
     beginRun(run, es);
   }
 
@@ -136,7 +133,7 @@ namespace edm {
     run.setConsumer(this);
     ESParentContext parentC(&moduleCallingContext_);
     const EventSetup es{
-        iES, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+        iES, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
     endRun(run, es);
   }
   void EDLooperBase::doBeginLuminosityBlock(LuminosityBlockPrincipal& iLB,
@@ -156,8 +153,7 @@ namespace edm {
     const EventSetup es{iES,
                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                         esGetTokenIndices(Transition::BeginLuminosityBlock),
-                        parentC,
-                        false};
+                        parentC};
     beginLuminosityBlock(luminosityBlock, es);
   }
   void EDLooperBase::doEndLuminosityBlock(LuminosityBlockPrincipal& iLB,
@@ -177,8 +173,7 @@ namespace edm {
     const EventSetup es{iES,
                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
                         esGetTokenIndices(Transition::EndLuminosityBlock),
-                        parentC,
-                        false};
+                        parentC};
     endLuminosityBlock(luminosityBlock, es);
   }
 
diff --git a/FWCore/Framework/src/EDProducer.cc b/FWCore/Framework/src/EDProducer.cc
index eda5ba67128b3..de2958db62732 100644
--- a/FWCore/Framework/src/EDProducer.cc
+++ b/FWCore/Framework/src/EDProducer.cc
@@ -32,7 +32,7 @@ namespace edm {
     EventSignalsSentry sentry(act, mcc);
     ESParentContext parentC(mcc);
     const EventSetup c{
-        info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+        info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
     this->produce(e, c);
     commit_(e, &previousParentageId_);
     return true;
@@ -52,7 +52,7 @@ namespace edm {
     Run const& cnstR = r;
     ESParentContext parentC(mcc);
     const EventSetup c{
-        info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC, false};
+        info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
     this->beginRun(cnstR, c);
     commit_(r);
   }
@@ -63,7 +63,7 @@ namespace edm {
     Run const& cnstR = r;
     ESParentContext parentC(mcc);
     const EventSetup c{
-        info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+        info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
     this->endRun(cnstR, c);
     commit_(r);
   }
@@ -76,8 +76,7 @@ namespace edm {
     const EventSetup c{info,
                        static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                        esGetTokenIndices(Transition::BeginLuminosityBlock),
-                       parentC,
-                       false};
+                       parentC};
     this->beginLuminosityBlock(cnstLb, c);
     commit_(lb);
   }
@@ -89,8 +88,7 @@ namespace edm {
     const EventSetup c{info,
                        static_cast<unsigned int>(Transition::EndLuminosityBlock),
                        esGetTokenIndices(Transition::EndLuminosityBlock),
-                       parentC,
-                       false};
+                       parentC};
     LuminosityBlock const& cnstLb = lb;
     this->endLuminosityBlock(cnstLb, c);
     commit_(lb);
diff --git a/FWCore/Framework/src/EventSetupRecord.cc b/FWCore/Framework/src/EventSetupRecord.cc
index f4cc3a9ad1eb4..bbaafca201d9d 100644
--- a/FWCore/Framework/src/EventSetupRecord.cc
+++ b/FWCore/Framework/src/EventSetupRecord.cc
@@ -134,7 +134,9 @@ namespace edm {
     void EventSetupRecord::throwCalledGetWithoutToken(const char* iTypeName, const char* iLabel) {
       throw cms::Exception("MustUseESGetToken")
           << "Called EventSetupRecord::get without using a ESGetToken.\n While requesting data type:" << iTypeName
-          << " label:'" << iLabel << "'";
+          << " label:'" << iLabel << "'\n"
+          << "See https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideHowToGetDataFromES\n"
+          << "for instructions how to migrate the calling code";
     }
 
   }  // namespace eventsetup
diff --git a/FWCore/Framework/src/global/EDAnalyzerBase.cc b/FWCore/Framework/src/global/EDAnalyzerBase.cc
index f1a1c2125029b..4aa19a725f038 100644
--- a/FWCore/Framework/src/global/EDAnalyzerBase.cc
+++ b/FWCore/Framework/src/global/EDAnalyzerBase.cc
@@ -57,7 +57,7 @@ namespace edm {
       EventSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       this->analyze(e.streamID(), e, c);
       return true;
     }
@@ -99,11 +99,8 @@ namespace edm {
       r.setConsumer(this);
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
     }
@@ -114,7 +111,7 @@ namespace edm {
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doEndRunSummary_(r, c);
       this->doEndRun_(cnstR, c);
     }
@@ -127,8 +124,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
     }
@@ -141,8 +137,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
     }
@@ -153,11 +148,8 @@ namespace edm {
       Run r(info, moduleDescription_, mcc, false);
       r.setConsumer(this);
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doStreamBeginRun_(id, r, c);
     }
     void EDAnalyzerBase::doStreamEndRun(StreamID id, RunTransitionInfo const& info, ModuleCallingContext const* mcc) {
@@ -165,7 +157,7 @@ namespace edm {
       r.setConsumer(this);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
@@ -178,8 +170,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doStreamBeginLuminosityBlock_(id, lb, c);
     }
 
@@ -192,8 +183,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doStreamEndLuminosityBlock_(id, lb, c);
       this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
diff --git a/FWCore/Framework/src/global/EDFilterBase.cc b/FWCore/Framework/src/global/EDFilterBase.cc
index 7ee20416e40c9..152ce661235ad 100644
--- a/FWCore/Framework/src/global/EDFilterBase.cc
+++ b/FWCore/Framework/src/global/EDFilterBase.cc
@@ -62,7 +62,7 @@ namespace edm {
       EventSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       bool returnValue = this->filter(e.streamID(), e, c);
       commit_(e, &previousParentageIds_[streamIndex]);
       return returnValue;
@@ -79,7 +79,7 @@ namespace edm {
       EventAcquireSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       this->doAcquire_(e.streamID(), e, c, holder);
     }
 
@@ -132,11 +132,8 @@ namespace edm {
       r.setConsumer(this);
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
       r.setProducer(this);
@@ -151,7 +148,7 @@ namespace edm {
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doEndRunSummary_(r, c);
       this->doEndRunProduce_(r, c);
       this->doEndRun_(cnstR, c);
@@ -166,8 +163,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
       lb.setProducer(this);
@@ -184,8 +180,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlockProduce_(lb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
@@ -198,11 +193,8 @@ namespace edm {
       Run r(info, moduleDescription_, mcc, false);
       r.setConsumer(this);
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doStreamBeginRun_(id, r, c);
     }
     void EDFilterBase::doStreamEndRun(StreamID id, RunTransitionInfo const& info, ModuleCallingContext const* mcc) {
@@ -210,7 +202,7 @@ namespace edm {
       r.setConsumer(this);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
@@ -223,8 +215,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doStreamBeginLuminosityBlock_(id, lb, c);
     }
 
@@ -237,8 +228,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doStreamEndLuminosityBlock_(id, lb, c);
       this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
diff --git a/FWCore/Framework/src/global/EDProducerBase.cc b/FWCore/Framework/src/global/EDProducerBase.cc
index b3ef3bf4c50b5..22524b7b7c54b 100644
--- a/FWCore/Framework/src/global/EDProducerBase.cc
+++ b/FWCore/Framework/src/global/EDProducerBase.cc
@@ -69,7 +69,7 @@ namespace edm {
           e.streamID(),
           e,
           EventSetup{
-              info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false});
+              info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC});
       commit_(e, &previousParentageIds_[streamIndex]);
       return true;
     }
@@ -85,7 +85,7 @@ namespace edm {
       EventAcquireSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       this->doAcquire_(e.streamID(), e, c, holder);
     }
 
@@ -138,11 +138,8 @@ namespace edm {
       r.setConsumer(this);
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
       r.setProducer(this);
@@ -157,7 +154,7 @@ namespace edm {
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doEndRunSummary_(r, c);
       this->doEndRunProduce_(r, c);
       this->doEndRun_(cnstR, c);
@@ -172,8 +169,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
       lb.setProducer(this);
@@ -190,8 +186,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlockProduce_(lb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
@@ -204,20 +199,18 @@ namespace edm {
       Run r(info, moduleDescription_, mcc, false);
       r.setConsumer(this);
       ESParentContext parentC(mcc);
-      this->doStreamBeginRun_(id,
-                              r,
-                              EventSetup{info,
-                                         static_cast<unsigned int>(Transition::BeginRun),
-                                         esGetTokenIndices(Transition::BeginRun),
-                                         parentC,
-                                         false});
+      this->doStreamBeginRun_(
+          id,
+          r,
+          EventSetup{
+              info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC});
     }
     void EDProducerBase::doStreamEndRun(StreamID id, RunTransitionInfo const& info, ModuleCallingContext const* mcc) {
       Run r(info, moduleDescription_, mcc, true);
       r.setConsumer(this);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
@@ -233,8 +226,7 @@ namespace edm {
                                           EventSetup{info,
                                                      static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                                                      esGetTokenIndices(Transition::BeginLuminosityBlock),
-                                                     parentC,
-                                                     false});
+                                                     parentC});
     }
 
     void EDProducerBase::doStreamEndLuminosityBlock(StreamID id,
@@ -246,8 +238,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doStreamEndLuminosityBlock_(id, lb, c);
       this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
diff --git a/FWCore/Framework/src/limited/EDAnalyzerBase.cc b/FWCore/Framework/src/limited/EDAnalyzerBase.cc
index 51e8b2e2e1eab..2452fc478ad04 100644
--- a/FWCore/Framework/src/limited/EDAnalyzerBase.cc
+++ b/FWCore/Framework/src/limited/EDAnalyzerBase.cc
@@ -58,7 +58,7 @@ namespace edm {
       EventSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       this->analyze(e.streamID(), e, c);
       return true;
     }
@@ -100,11 +100,8 @@ namespace edm {
       r.setConsumer(this);
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
     }
@@ -115,7 +112,7 @@ namespace edm {
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doEndRunSummary_(r, c);
       this->doEndRun_(cnstR, c);
     }
@@ -128,8 +125,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
     }
@@ -142,8 +138,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
     }
@@ -154,11 +149,8 @@ namespace edm {
       Run r(info, moduleDescription_, mcc, false);
       r.setConsumer(this);
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doStreamBeginRun_(id, r, c);
     }
     void EDAnalyzerBase::doStreamEndRun(StreamID id, RunTransitionInfo const& info, ModuleCallingContext const* mcc) {
@@ -166,7 +158,7 @@ namespace edm {
       r.setConsumer(this);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
@@ -179,8 +171,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doStreamBeginLuminosityBlock_(id, lb, c);
     }
 
@@ -193,8 +184,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doStreamEndLuminosityBlock_(id, lb, c);
       this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
diff --git a/FWCore/Framework/src/limited/EDFilterBase.cc b/FWCore/Framework/src/limited/EDFilterBase.cc
index c89a64405e530..10ddcef23e9b3 100644
--- a/FWCore/Framework/src/limited/EDFilterBase.cc
+++ b/FWCore/Framework/src/limited/EDFilterBase.cc
@@ -60,7 +60,7 @@ namespace edm {
       e.setProducer(this, &previousParentages_[streamIndex]);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       EventSignalsSentry sentry(act, mcc);
       bool returnValue = this->filter(e.streamID(), e, c);
       commit_(e, &previousParentageIds_[streamIndex]);
@@ -113,11 +113,8 @@ namespace edm {
       r.setConsumer(this);
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
       r.setProducer(this);
@@ -132,7 +129,7 @@ namespace edm {
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doEndRunSummary_(r, c);
       this->doEndRunProduce_(r, c);
       this->doEndRun_(cnstR, c);
@@ -147,8 +144,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
       lb.setProducer(this);
@@ -165,8 +161,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlockProduce_(lb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
@@ -179,11 +174,8 @@ namespace edm {
       Run r(info, moduleDescription_, mcc, false);
       r.setConsumer(this);
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doStreamBeginRun_(id, r, c);
     }
     void EDFilterBase::doStreamEndRun(StreamID id, RunTransitionInfo const& info, ModuleCallingContext const* mcc) {
@@ -191,7 +183,7 @@ namespace edm {
       r.setConsumer(this);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
@@ -203,8 +195,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       lb.setConsumer(this);
       this->doStreamBeginLuminosityBlock_(id, lb, c);
     }
@@ -218,8 +209,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doStreamEndLuminosityBlock_(id, lb, c);
       this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
diff --git a/FWCore/Framework/src/limited/EDProducerBase.cc b/FWCore/Framework/src/limited/EDProducerBase.cc
index 7e8058fa07847..4cbd373ddbdab 100644
--- a/FWCore/Framework/src/limited/EDProducerBase.cc
+++ b/FWCore/Framework/src/limited/EDProducerBase.cc
@@ -61,7 +61,7 @@ namespace edm {
       EventSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       this->produce(e.streamID(), e, c);
       commit_(e, &previousParentageIds_[streamIndex]);
       return true;
@@ -113,11 +113,8 @@ namespace edm {
       r.setConsumer(this);
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
       r.setProducer(this);
@@ -132,7 +129,7 @@ namespace edm {
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doEndRunSummary_(r, c);
       this->doEndRunProduce_(r, c);
       this->doEndRun_(cnstR, c);
@@ -147,8 +144,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
       lb.setProducer(this);
@@ -165,8 +161,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlockProduce_(lb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
@@ -179,11 +174,8 @@ namespace edm {
       Run r(info, moduleDescription_, mcc, false);
       r.setConsumer(this);
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doStreamBeginRun_(id, r, c);
     }
     void EDProducerBase::doStreamEndRun(StreamID id, RunTransitionInfo const& info, ModuleCallingContext const* mcc) {
@@ -191,7 +183,7 @@ namespace edm {
       r.setConsumer(this);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
@@ -204,8 +196,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doStreamBeginLuminosityBlock_(id, lb, c);
     }
 
@@ -218,8 +209,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doStreamEndLuminosityBlock_(id, lb, c);
       this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
diff --git a/FWCore/Framework/src/one/EDAnalyzerBase.cc b/FWCore/Framework/src/one/EDAnalyzerBase.cc
index a35ba9eb02c69..b714d94dccd80 100644
--- a/FWCore/Framework/src/one/EDAnalyzerBase.cc
+++ b/FWCore/Framework/src/one/EDAnalyzerBase.cc
@@ -60,7 +60,7 @@ namespace edm {
       EventSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       this->analyze(e, c);
       return true;
     }
@@ -112,11 +112,8 @@ namespace edm {
       r.setConsumer(this);
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doBeginRun_(cnstR, c);
     }
 
@@ -126,7 +123,7 @@ namespace edm {
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doEndRun_(cnstR, c);
     }
 
@@ -138,8 +135,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doBeginLuminosityBlock_(cnstLb, c);
     }
 
@@ -151,8 +147,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doEndLuminosityBlock_(cnstLb, c);
     }
 
diff --git a/FWCore/Framework/src/one/EDFilterBase.cc b/FWCore/Framework/src/one/EDFilterBase.cc
index cc3322c0253c4..a302105b296ad 100644
--- a/FWCore/Framework/src/one/EDFilterBase.cc
+++ b/FWCore/Framework/src/one/EDFilterBase.cc
@@ -57,7 +57,7 @@ namespace edm {
       EventSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       returnValue = this->filter(e, c);
       commit_(e, &previousParentageId_);
       return returnValue;
@@ -118,11 +118,8 @@ namespace edm {
       r.setConsumer(this);
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doBeginRun_(cnstR, c);
       r.setProducer(this);
       this->doBeginRunProduce_(r, c);
@@ -135,7 +132,7 @@ namespace edm {
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doEndRun_(cnstR, c);
       r.setProducer(this);
       this->doEndRunProduce_(r, c);
@@ -150,8 +147,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doBeginLuminosityBlock_(cnstLb, c);
       lb.setProducer(this);
       this->doBeginLuminosityBlockProduce_(lb, c);
@@ -166,8 +162,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doEndLuminosityBlock_(cnstLb, c);
       lb.setProducer(this);
       this->doEndLuminosityBlockProduce_(lb, c);
diff --git a/FWCore/Framework/src/one/EDProducerBase.cc b/FWCore/Framework/src/one/EDProducerBase.cc
index 621eb4d1e56a8..4f96084edbac8 100644
--- a/FWCore/Framework/src/one/EDProducerBase.cc
+++ b/FWCore/Framework/src/one/EDProducerBase.cc
@@ -56,7 +56,7 @@ namespace edm {
       EventSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event), parentC};
       this->produce(e, c);
       commit_(e, &previousParentageId_);
       return true;
@@ -118,11 +118,8 @@ namespace edm {
       r.setConsumer(this);
       Run const& cnstR = r;
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun), parentC};
       this->doBeginRun_(cnstR, c);
       r.setProducer(this);
       this->doBeginRunProduce_(r, c);
@@ -136,7 +133,7 @@ namespace edm {
       r.setProducer(this);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC, false};
+          info, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun), parentC};
       this->doEndRunProduce_(r, c);
       this->doEndRun_(cnstR, c);
       commit_(r);
@@ -150,8 +147,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doBeginLuminosityBlock_(cnstLb, c);
       lb.setProducer(this);
       this->doBeginLuminosityBlockProduce_(lb, c);
@@ -166,8 +162,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       this->doEndLuminosityBlockProduce_(lb, c);
       LuminosityBlock const& cnstLb = lb;
       this->doEndLuminosityBlock_(cnstLb, c);
diff --git a/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc b/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc
index 2cff309ee689c..43fa0724c2ea5 100644
--- a/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc
+++ b/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc
@@ -154,7 +154,7 @@ bool EDAnalyzerAdaptorBase::doEvent(EventTransitionInfo const& info,
   e.setConsumer(mod);
   ESParentContext parentC(mcc);
   const EventSetup c{
-      info, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event), parentC, false};
+      info, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event), parentC};
   EventSignalsSentry sentry(act, mcc);
   mod->analyze(e, c);
   return true;
@@ -172,11 +172,8 @@ void EDAnalyzerAdaptorBase::doStreamBeginRun(StreamID id,
 
   Run r(rp, moduleDescription_, mcc, false);
   ESParentContext parentC(mcc);
-  const EventSetup c{info,
-                     static_cast<unsigned int>(Transition::BeginRun),
-                     mod->esGetTokenIndices(Transition::BeginRun),
-                     parentC,
-                     false};
+  const EventSetup c{
+      info, static_cast<unsigned int>(Transition::BeginRun), mod->esGetTokenIndices(Transition::BeginRun), parentC};
   r.setConsumer(mod);
   mod->beginRun(r, c);
 }
@@ -189,7 +186,7 @@ void EDAnalyzerAdaptorBase::doStreamEndRun(StreamID id,
   r.setConsumer(mod);
   ESParentContext parentC(mcc);
   const EventSetup c{
-      info, static_cast<unsigned int>(Transition::EndRun), mod->esGetTokenIndices(Transition::EndRun), parentC, false};
+      info, static_cast<unsigned int>(Transition::EndRun), mod->esGetTokenIndices(Transition::EndRun), parentC};
   mod->endRun(r, c);
   streamEndRunSummary(mod, r, c);
 }
@@ -207,8 +204,7 @@ void EDAnalyzerAdaptorBase::doStreamBeginLuminosityBlock(StreamID id,
   const EventSetup c{info,
                      static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                      mod->esGetTokenIndices(Transition::BeginLuminosityBlock),
-                     parentC,
-                     false};
+                     parentC};
   mod->beginLuminosityBlock(lb, c);
 }
 void EDAnalyzerAdaptorBase::doStreamEndLuminosityBlock(StreamID id,
@@ -221,8 +217,7 @@ void EDAnalyzerAdaptorBase::doStreamEndLuminosityBlock(StreamID id,
   const EventSetup c{info,
                      static_cast<unsigned int>(Transition::EndLuminosityBlock),
                      mod->esGetTokenIndices(Transition::EndLuminosityBlock),
-                     parentC,
-                     false};
+                     parentC};
   mod->endLuminosityBlock(lb, c);
   streamEndLuminosityBlockSummary(mod, lb, c);
 }
diff --git a/FWCore/Framework/src/stream/EDFilterAdaptorBase.cc b/FWCore/Framework/src/stream/EDFilterAdaptorBase.cc
index 8ce606196fe2d..8d609a18d3f37 100644
--- a/FWCore/Framework/src/stream/EDFilterAdaptorBase.cc
+++ b/FWCore/Framework/src/stream/EDFilterAdaptorBase.cc
@@ -57,7 +57,7 @@ namespace edm {
       EventSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event), parentC};
       bool result = mod->filter(e, c);
       commit(e, &mod->previousParentageId_);
       return result;
@@ -76,7 +76,7 @@ namespace edm {
       EventAcquireSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event), parentC};
       mod->doAcquire_(e, c, holder);
     }
 
diff --git a/FWCore/Framework/src/stream/EDProducerAdaptorBase.cc b/FWCore/Framework/src/stream/EDProducerAdaptorBase.cc
index 8e515516c548d..7d2bcc13772b1 100644
--- a/FWCore/Framework/src/stream/EDProducerAdaptorBase.cc
+++ b/FWCore/Framework/src/stream/EDProducerAdaptorBase.cc
@@ -57,7 +57,7 @@ namespace edm {
       EventSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event), parentC};
       mod->produce(e, c);
       commit(e, &mod->previousParentageId_);
       return true;
@@ -76,7 +76,7 @@ namespace edm {
       EventAcquireSignalsSentry sentry(act, mcc);
       ESParentContext parentC(mcc);
       const EventSetup c{
-          info, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event), parentC, false};
+          info, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event), parentC};
       mod->doAcquire_(e, c, holder);
     }
 
diff --git a/FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc b/FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc
index b34073bfe8425..8b72985618243 100644
--- a/FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc
+++ b/FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc
@@ -192,11 +192,8 @@ namespace edm {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(mod);
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::BeginRun),
-                         mod->esGetTokenIndices(Transition::BeginRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::BeginRun), mod->esGetTokenIndices(Transition::BeginRun), parentC};
       mod->beginRun(r, c);
     }
 
@@ -208,11 +205,8 @@ namespace edm {
       Run r(info, moduleDescription_, mcc, true);
       r.setConsumer(mod);
       ESParentContext parentC(mcc);
-      const EventSetup c{info,
-                         static_cast<unsigned int>(Transition::EndRun),
-                         mod->esGetTokenIndices(Transition::EndRun),
-                         parentC,
-                         false};
+      const EventSetup c{
+          info, static_cast<unsigned int>(Transition::EndRun), mod->esGetTokenIndices(Transition::EndRun), parentC};
       mod->endRun(r, c);
       streamEndRunSummary(mod, r, c);
     }
@@ -231,8 +225,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
                          mod->esGetTokenIndices(Transition::BeginLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       mod->beginLuminosityBlock(lb, c);
     }
 
@@ -247,8 +240,7 @@ namespace edm {
       const EventSetup c{info,
                          static_cast<unsigned int>(Transition::EndLuminosityBlock),
                          mod->esGetTokenIndices(Transition::EndLuminosityBlock),
-                         parentC,
-                         false};
+                         parentC};
       mod->endLuminosityBlock(lb, c);
       streamEndLuminosityBlockSummary(mod, lb, c);
     }
diff --git a/FWCore/Framework/test/callback_t.cppunit.cc b/FWCore/Framework/test/callback_t.cppunit.cc
index 7e224ec766a6e..e889f6a800be6 100644
--- a/FWCore/Framework/test/callback_t.cppunit.cc
+++ b/FWCore/Framework/test/callback_t.cppunit.cc
@@ -39,8 +39,7 @@ namespace callbacktest {
                  unsigned int transitionID,
                  void const* getTokenIndices,
                  void const* iEventSetupImpl,
-                 void const* ESParentContext,
-                 bool requireTokens) {}
+                 void const* ESParentContext) {}
     constexpr static bool allowConcurrentIOVs_ = false;
   };
 
diff --git a/FWCore/Framework/test/dependentrecord_t.cppunit.cc b/FWCore/Framework/test/dependentrecord_t.cppunit.cc
index 04f792a61ac2b..f7ff7a301634f 100644
--- a/FWCore/Framework/test/dependentrecord_t.cppunit.cc
+++ b/FWCore/Framework/test/dependentrecord_t.cppunit.cc
@@ -611,16 +611,16 @@ void testdependentrecord::timeAndRunTest() {
     {
       edm::ESParentContext parentC;
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(1)));
-      const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC);
       long long id1 = eventSetup1.get<DepOn2Record>().cacheIdentifier();
 
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(2)));
-      const edm::EventSetup eventSetup2(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup2(provider.eventSetupImpl(), 0, nullptr, parentC);
       long long id2 = eventSetup2.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 == id2);
 
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 2), edm::Timestamp(2)));
-      const edm::EventSetup eventSetup3(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup3(provider.eventSetupImpl(), 0, nullptr, parentC);
       long long id3 = eventSetup3.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 == id3);
 
@@ -628,7 +628,7 @@ void testdependentrecord::timeAndRunTest() {
           edm::ValidityInterval(edm::IOVSyncValue(edm::Timestamp(6)), edm::IOVSyncValue(edm::Timestamp(10))));
 
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 4), edm::Timestamp(7)));
-      const edm::EventSetup eventSetup4(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup4(provider.eventSetupImpl(), 0, nullptr, parentC);
       long long id4 = eventSetup4.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 != id4);
 
@@ -636,7 +636,7 @@ void testdependentrecord::timeAndRunTest() {
           edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 6)), edm::IOVSyncValue(edm::EventID(1, 1, 10))));
 
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(8)));
-      const edm::EventSetup eventSetup5(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup5(provider.eventSetupImpl(), 0, nullptr, parentC);
       long long id5 = eventSetup5.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id4 != id5);
     }
@@ -666,30 +666,30 @@ void testdependentrecord::timeAndRunTest() {
     {
       edm::ESParentContext parentC;
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(1)));
-      const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC);
       long long id1 = eventSetup1.get<DepOn2Record>().cacheIdentifier();
 
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(2)));
-      const edm::EventSetup eventSetup2(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup2(provider.eventSetupImpl(), 0, nullptr, parentC);
       long long id2 = eventSetup2.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 == id2);
 
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 2), edm::Timestamp(2)));
-      const edm::EventSetup eventSetup3(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup3(provider.eventSetupImpl(), 0, nullptr, parentC);
       long long id3 = eventSetup3.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 == id3);
 
       dummy2Finder->setInterval(
           edm::ValidityInterval(edm::IOVSyncValue(edm::Timestamp(6)), edm::IOVSyncValue::invalidIOVSyncValue()));
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 4), edm::Timestamp(7)));
-      const edm::EventSetup eventSetup4(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup4(provider.eventSetupImpl(), 0, nullptr, parentC);
       long long id4 = eventSetup4.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 != id4);
 
       dummyFinder->setInterval(
           edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 6)), edm::IOVSyncValue::invalidIOVSyncValue()));
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(8)));
-      const edm::EventSetup eventSetup5(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup5(provider.eventSetupImpl(), 0, nullptr, parentC);
       long long id5 = eventSetup5.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id4 != id5);
     }
@@ -731,7 +731,7 @@ void testdependentrecord::getTest() {
   edm::ESParentContext parentC;
   {
     controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1)));
-    const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+    const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC);
     const DepRecord& depRecord = eventSetup1.get<DepRecord>();
 
     depRecord.getRecord<DummyRecord>();
@@ -741,7 +741,7 @@ void testdependentrecord::getTest() {
   }
   {
     controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 4)));
-    const edm::EventSetup eventSetup2(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+    const edm::EventSetup eventSetup2(provider.eventSetupImpl(), 0, nullptr, parentC);
     CPPUNIT_ASSERT_THROW(eventSetup2.get<DepRecord>(), edm::eventsetup::NoRecordException<DepRecord>);
   }
 }
@@ -855,8 +855,7 @@ void testdependentrecord::getDataWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& data = eventSetup.getData(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data.value_);
     }
@@ -867,8 +866,7 @@ void testdependentrecord::getDataWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& data = eventSetup.getData(consumer.m_token);
       CPPUNIT_ASSERT(kBad.value_ == data.value_);
     }
@@ -879,8 +877,7 @@ void testdependentrecord::getDataWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
       auto const& data = depRecord.get(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data.value_);
@@ -892,8 +889,7 @@ void testdependentrecord::getDataWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       auto const& data = depRecord.get(consumer.m_token);
@@ -906,8 +902,7 @@ void testdependentrecord::getDataWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       auto const& data = depRecord.get(consumer.m_token);
@@ -920,8 +915,7 @@ void testdependentrecord::getDataWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       auto const& data1 = depRecord.get(consumer.m_token1);
@@ -937,8 +931,7 @@ void testdependentrecord::getDataWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       CPPUNIT_ASSERT_THROW(depRecord.get(consumer.m_token), cms::Exception);
@@ -950,8 +943,7 @@ void testdependentrecord::getDataWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       CPPUNIT_ASSERT_THROW(depRecord.get(consumer.m_token), cms::Exception);
@@ -1010,8 +1002,7 @@ void testdependentrecord::getHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
@@ -1024,8 +1015,7 @@ void testdependentrecord::getHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
       CPPUNIT_ASSERT(kBad.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
@@ -1038,8 +1028,7 @@ void testdependentrecord::getHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       edm::ESHandle<DummyData> data = depRecord.getHandle(consumer.m_token);
@@ -1054,8 +1043,7 @@ void testdependentrecord::getHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       edm::ESHandle<DummyData> data = depRecord.getHandle(consumer.m_token);
@@ -1070,8 +1058,7 @@ void testdependentrecord::getHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       edm::ESHandle<DummyData> data = depRecord.getHandle(consumer.m_token);
@@ -1086,8 +1073,7 @@ void testdependentrecord::getHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       edm::ESHandle<DummyData> data1 = depRecord.getHandle(consumer.m_token1);
@@ -1107,8 +1093,7 @@ void testdependentrecord::getHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       CPPUNIT_ASSERT(not depRecord.getHandle(consumer.m_token));
@@ -1121,8 +1106,7 @@ void testdependentrecord::getHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       CPPUNIT_ASSERT(not depRecord.getHandle(consumer.m_token));
@@ -1181,8 +1165,7 @@ void testdependentrecord::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
@@ -1195,8 +1178,7 @@ void testdependentrecord::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
       CPPUNIT_ASSERT(kBad.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
@@ -1209,8 +1191,7 @@ void testdependentrecord::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       edm::ESTransientHandle<DummyData> data = depRecord.getTransientHandle(consumer.m_token);
@@ -1225,8 +1206,7 @@ void testdependentrecord::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       edm::ESTransientHandle<DummyData> data = depRecord.getTransientHandle(consumer.m_token);
@@ -1241,8 +1221,7 @@ void testdependentrecord::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       edm::ESTransientHandle<DummyData> data = depRecord.getTransientHandle(consumer.m_token);
@@ -1257,8 +1236,7 @@ void testdependentrecord::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       edm::ESTransientHandle<DummyData> data1 = depRecord.getTransientHandle(consumer.m_token1);
@@ -1278,8 +1256,7 @@ void testdependentrecord::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       edm::ESTransientHandle<DummyData> data = depRecord.getTransientHandle(consumer.m_token);
@@ -1293,8 +1270,7 @@ void testdependentrecord::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       parentC,
-                                       true};
+                                       parentC};
       auto const& depRecord = eventSetup.get<DepRecord>();
 
       edm::ESTransientHandle<DummyData> data = depRecord.getTransientHandle(consumer.m_token);
@@ -1325,7 +1301,7 @@ void testdependentrecord::oneOfTwoRecordTest() {
   {
     edm::ESParentContext parentC;
     controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1)));
-    const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+    const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC);
     const DepOn2Record& depRecord = eventSetup1.get<DepOn2Record>();
 
     depRecord.getRecord<DummyRecord>();
@@ -1360,7 +1336,7 @@ void testdependentrecord::resetTest() {
   {
     edm::ESParentContext parentC;
     controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1)));
-    const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+    const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC);
     const DepRecord& depRecord = eventSetup1.get<DepRecord>();
     unsigned long long depCacheID = depRecord.cacheIdentifier();
     const DummyRecord& dummyRecord = depRecord.getRecord<DummyRecord>();
@@ -1510,14 +1486,14 @@ void testdependentrecord::extendIOVTest() {
   provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummy2Finder));
   {
     controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(1)));
-    const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+    const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, parentC);
     unsigned long long id1 = eventSetup1.get<DepOn2Record>().cacheIdentifier();
     CPPUNIT_ASSERT(id1 == eventSetup1.get<DummyRecord>().cacheIdentifier());
     CPPUNIT_ASSERT(id1 == eventSetup1.get<Dummy2Record>().cacheIdentifier());
 
     {
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 5), edm::Timestamp(2)));
-      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC);
       unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 == id);
       CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
@@ -1527,7 +1503,7 @@ void testdependentrecord::extendIOVTest() {
     dummyFinder->setInterval(edm::ValidityInterval{startSyncValue, edm::IOVSyncValue{edm::EventID{1, 1, 7}}});
     {
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 6), edm::Timestamp(7)));
-      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC);
       unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 == id);
       CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
@@ -1539,7 +1515,7 @@ void testdependentrecord::extendIOVTest() {
 
     {
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(7)));
-      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC);
       unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 == id);
       CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
@@ -1551,7 +1527,7 @@ void testdependentrecord::extendIOVTest() {
     dummyFinder->setInterval(edm::ValidityInterval{startSyncValue, edm::IOVSyncValue{edm::EventID{1, 1, 8}}});
     {
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 8), edm::Timestamp(7)));
-      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC);
       unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 == id);
       CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
@@ -1564,7 +1540,7 @@ void testdependentrecord::extendIOVTest() {
         edm::ValidityInterval{edm::IOVSyncValue{edm::EventID{1, 1, 9}}, edm::IOVSyncValue{edm::EventID{1, 1, 9}}});
     {
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 9), edm::Timestamp(7)));
-      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC);
       unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 + 1 == id);
       CPPUNIT_ASSERT(id1 + 1 == eventSetup.get<DummyRecord>().cacheIdentifier());
@@ -1579,7 +1555,7 @@ void testdependentrecord::extendIOVTest() {
 
     {
       controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 10), edm::Timestamp(7)));
-      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, true);
+      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC);
       unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
       CPPUNIT_ASSERT(id1 + 2 == id);
       CPPUNIT_ASSERT(id1 + 1 == eventSetup.get<DummyRecord>().cacheIdentifier());
diff --git a/FWCore/Framework/test/esproducer_t.cppunit.cc b/FWCore/Framework/test/esproducer_t.cppunit.cc
index 2033edbc25f11..e8c724df2626a 100644
--- a/FWCore/Framework/test/esproducer_t.cppunit.cc
+++ b/FWCore/Framework/test/esproducer_t.cppunit.cc
@@ -7,6 +7,7 @@
  */
 #include <iostream>
 #include "cppunit/extensions/HelperMacros.h"
+#include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/test/DummyData.h"
 #include "FWCore/Framework/test/Dummy2Record.h"
@@ -22,6 +23,7 @@
 #include "FWCore/Framework/interface/es_Label.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducts.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/Utilities/interface/do_nothing_deleter.h"
@@ -46,6 +48,42 @@ namespace {
     return pset;
   }
   edm::ActivityRegistry activityRegistry;
+
+  struct DummyDataConsumerBase : public edm::EDConsumerBase {
+    void prefetch(edm::EventSetupImpl const& iImpl) const {
+      auto const& recs = this->esGetTokenRecordIndicesVector(edm::Transition::Event);
+      auto const& proxies = this->esGetTokenIndicesVector(edm::Transition::Event);
+      for (size_t i = 0; i != proxies.size(); ++i) {
+        auto rec = iImpl.findImpl(recs[i]);
+        if (rec) {
+          edm::FinalWaitingTask waitTask;
+          tbb::task_group group;
+          rec->prefetchAsync(
+              edm::WaitingTaskHolder(group, &waitTask), proxies[i], &iImpl, edm::ServiceToken{}, edm::ESParentContext{});
+          do {
+            group.wait();
+          } while (not waitTask.done());
+          if (waitTask.exceptionPtr()) {
+            std::rethrow_exception(*waitTask.exceptionPtr());
+          }
+        }
+      }
+    }
+  };
+
+  template <typename Record>
+  struct DummyDataConsumer : public DummyDataConsumerBase {
+    DummyDataConsumer() : m_token{esConsumes()} {}
+    edm::ESGetToken<DummyData, Record> m_token;
+  };
+
+  struct DummyDataConsumer2 : public DummyDataConsumerBase {
+    DummyDataConsumer2(edm::ESInputTag const& tag1, edm::ESInputTag const& tag2, edm::ESInputTag const& tag3)
+        : m_token1{esConsumes(tag1)}, m_token2{esConsumes(tag2)}, m_token3{esConsumes(tag3)} {}
+    edm::ESGetToken<DummyData, DummyRecord> m_token1;
+    edm::ESGetToken<DummyData, DummyRecord> m_token2;
+    edm::ESGetToken<DummyData, DummyRecord> m_token3;
+  };
 }  // namespace
 
 class testEsproducer : public CppUnit::TestFixture {
@@ -211,9 +249,14 @@ void testEsproducer::getFromTest() {
     const edm::Timestamp time(iTime);
     pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
     controller.eventSetupForInstance(edm::IOVSyncValue(time));
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, false);
-    edm::ESHandle<DummyData> pDummy;
-    eventSetup.get<DummyRecord>().get(pDummy);
+    DummyDataConsumer<DummyRecord> consumer;
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(),
+                                     static_cast<unsigned int>(edm::Transition::Event),
+                                     consumer.esGetTokenIndices(edm::Transition::Event),
+                                     parentC);
+    edm::ESHandle<DummyData> pDummy = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(0 != pDummy.product());
     CPPUNIT_ASSERT(iTime == pDummy->value_);
   }
@@ -235,9 +278,14 @@ void testEsproducer::getfromShareTest() {
     const edm::Timestamp time(iTime);
     pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
     controller.eventSetupForInstance(edm::IOVSyncValue(time));
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, false);
-    edm::ESHandle<DummyData> pDummy;
-    eventSetup.get<DummyRecord>().get(pDummy);
+    DummyDataConsumer<DummyRecord> consumer;
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(),
+                                     static_cast<unsigned int>(edm::Transition::Event),
+                                     consumer.esGetTokenIndices(edm::Transition::Event),
+                                     parentC);
+    edm::ESHandle<DummyData> pDummy = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(0 != pDummy.product());
     CPPUNIT_ASSERT(iTime == pDummy->value_);
   }
@@ -259,9 +307,14 @@ void testEsproducer::getfromUniqueTest() {
     const edm::Timestamp time(iTime);
     pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
     controller.eventSetupForInstance(edm::IOVSyncValue(time));
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, false);
-    edm::ESHandle<DummyData> pDummy;
-    eventSetup.get<DummyRecord>().get(pDummy);
+    DummyDataConsumer<DummyRecord> consumer;
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(),
+                                     static_cast<unsigned int>(edm::Transition::Event),
+                                     consumer.esGetTokenIndices(edm::Transition::Event),
+                                     parentC);
+    edm::ESHandle<DummyData> pDummy = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(0 != pDummy.product());
     CPPUNIT_ASSERT(iTime == pDummy->value_);
   }
@@ -282,9 +335,14 @@ void testEsproducer::getfromOptionalTest() {
     const edm::Timestamp time(iTime);
     pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
     controller.eventSetupForInstance(edm::IOVSyncValue(time));
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, false);
-    edm::ESHandle<DummyData> pDummy;
-    eventSetup.get<DummyRecord>().get(pDummy);
+    DummyDataConsumer<DummyRecord> consumer;
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(),
+                                     static_cast<unsigned int>(edm::Transition::Event),
+                                     consumer.esGetTokenIndices(edm::Transition::Event),
+                                     parentC);
+    edm::ESHandle<DummyData> pDummy = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(0 != pDummy.product());
     CPPUNIT_ASSERT(iTime == pDummy->value_);
   }
@@ -307,17 +365,23 @@ void testEsproducer::labelTest() {
       const edm::Timestamp time(iTime);
       pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
       controller.eventSetupForInstance(edm::IOVSyncValue(time));
-      const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, false);
-      edm::ESHandle<DummyData> pDummy;
-      eventSetup.get<DummyRecord>().get("foo", pDummy);
+      DummyDataConsumer2 consumer(edm::ESInputTag("", "foo"), edm::ESInputTag("", "fi"), edm::ESInputTag("", "fum"));
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      consumer.prefetch(provider.eventSetupImpl());
+      const edm::EventSetup eventSetup(provider.eventSetupImpl(),
+                                       static_cast<unsigned int>(edm::Transition::Event),
+                                       consumer.esGetTokenIndices(edm::Transition::Event),
+                                       parentC);
+
+      edm::ESHandle<DummyData> pDummy = eventSetup.getHandle(consumer.m_token1);
       CPPUNIT_ASSERT(0 != pDummy.product());
       CPPUNIT_ASSERT(iTime == pDummy->value_);
 
-      eventSetup.get<DummyRecord>().get("fi", pDummy);
+      pDummy = eventSetup.getHandle(consumer.m_token2);
       CPPUNIT_ASSERT(0 != pDummy.product());
       CPPUNIT_ASSERT(iTime == pDummy->value_);
 
-      eventSetup.get<DummyRecord>().get("fum", pDummy);
+      pDummy = eventSetup.getHandle(consumer.m_token3);
       CPPUNIT_ASSERT(0 != pDummy.product());
       CPPUNIT_ASSERT(iTime == pDummy->value_);
     }
@@ -366,12 +430,17 @@ void testEsproducer::decoratorTest() {
     const edm::Timestamp time(iTime);
     pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
     controller.eventSetupForInstance(edm::IOVSyncValue(time));
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, false);
-    edm::ESHandle<DummyData> pDummy;
+    DummyDataConsumer<DummyRecord> consumer;
+    consumer.updateLookup(provider.recordsToProxyIndices());
 
     CPPUNIT_ASSERT(iTime - 1 == TestDecorator::s_pre);
     CPPUNIT_ASSERT(iTime - 1 == TestDecorator::s_post);
-    eventSetup.get<DummyRecord>().get(pDummy);
+    consumer.prefetch(provider.eventSetupImpl());
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(),
+                                     static_cast<unsigned int>(edm::Transition::Event),
+                                     consumer.esGetTokenIndices(edm::Transition::Event),
+                                     parentC);
+    edm::ESHandle<DummyData> pDummy = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(0 != pDummy.product());
     CPPUNIT_ASSERT(iTime == TestDecorator::s_pre);
     CPPUNIT_ASSERT(iTime == TestDecorator::s_post);
@@ -411,10 +480,14 @@ void testEsproducer::dependsOnTest() {
     const edm::Timestamp time(iTime);
     pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
     controller.eventSetupForInstance(edm::IOVSyncValue(time));
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, false);
-    edm::ESHandle<DummyData> pDummy;
-
-    eventSetup.get<DepRecord>().get(pDummy);
+    DummyDataConsumer<DepRecord> consumer;
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(),
+                                     static_cast<unsigned int>(edm::Transition::Event),
+                                     consumer.esGetTokenIndices(edm::Transition::Event),
+                                     parentC);
+    edm::ESHandle<DummyData> pDummy = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(0 != pDummy.product());
     CPPUNIT_ASSERT(3 * iTime == pDummy->value_);
   }
@@ -435,21 +508,31 @@ void testEsproducer::forceCacheClearTest() {
   const edm::Timestamp time(1);
   pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
   controller.eventSetupForInstance(edm::IOVSyncValue(time));
-  edm::ESParentContext parentC;
-  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, parentC, false);
   {
-    edm::ESHandle<DummyData> pDummy;
-    eventSetup.get<DummyRecord>().get(pDummy);
+    DummyDataConsumer<DummyRecord> consumer;
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    edm::ESParentContext parentC;
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(),
+                                     static_cast<unsigned int>(edm::Transition::Event),
+                                     consumer.esGetTokenIndices(edm::Transition::Event),
+                                     parentC);
+    edm::ESHandle<DummyData> pDummy = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(0 != pDummy.product());
     CPPUNIT_ASSERT(1 == pDummy->value_);
   }
   provider.forceCacheClear();
   controller.eventSetupForInstance(edm::IOVSyncValue(time));
   {
+    DummyDataConsumer<DummyRecord> consumer;
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
     edm::ESParentContext parentC;
-    const edm::EventSetup eventSetup2(provider.eventSetupImpl(), 0, nullptr, parentC, false);
-    edm::ESHandle<DummyData> pDummy;
-    eventSetup2.get<DummyRecord>().get(pDummy);
+    const edm::EventSetup eventSetup2(provider.eventSetupImpl(),
+                                      static_cast<unsigned int>(edm::Transition::Event),
+                                      consumer.esGetTokenIndices(edm::Transition::Event),
+                                      parentC);
+    edm::ESHandle<DummyData> pDummy = eventSetup2.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(0 != pDummy.product());
     CPPUNIT_ASSERT(2 == pDummy->value_);
   }
diff --git a/FWCore/Framework/test/eventsetup_t.cppunit.cc b/FWCore/Framework/test/eventsetup_t.cppunit.cc
index 5ccc7d1727419..237baafaa457e 100644
--- a/FWCore/Framework/test/eventsetup_t.cppunit.cc
+++ b/FWCore/Framework/test/eventsetup_t.cppunit.cc
@@ -79,8 +79,6 @@ class testEventsetup : public CppUnit::TestFixture {
   CPPUNIT_TEST(tryToGetTest);
   CPPUNIT_TEST_EXCEPTION(getExcTest, edm::eventsetup::NoRecordException<DummyRecord>);
   CPPUNIT_TEST(provenanceTest);
-  CPPUNIT_TEST(getDataWithLabelTest);
-  CPPUNIT_TEST(getDataWithESInputTagTest);
   CPPUNIT_TEST(getDataWithESGetTokenTest);
   CPPUNIT_TEST(getHandleWithESGetTokenTest);
   CPPUNIT_TEST(getTransientHandleWithESGetTokenTest);
@@ -119,8 +117,6 @@ class testEventsetup : public CppUnit::TestFixture {
   void recordValidityProxyNoFinderTest();
   void recordValidityProxyNoFinderExcTest();
   void provenanceTest();
-  void getDataWithLabelTest();
-  void getDataWithESInputTagTest();
   void getDataWithESGetTokenTest();
   void getHandleWithESGetTokenTest();
   void getTransientHandleWithESGetTokenTest();
@@ -159,7 +155,7 @@ void testEventsetup::constructTest() {
   auto eventSetupImpl = provider.eventSetupForInstance(timestamp, newEventSetupImpl);
   CPPUNIT_ASSERT(non_null(eventSetupImpl.get()));
   edm::ESParentContext pc;
-  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, true);
+  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc);
 }
 
 // Note there is a similar test in dependentrecord_t.cppunit.cc
@@ -177,7 +173,7 @@ void testEventsetup::getTest() {
   EventSetupRecordImpl dummyRecordImpl{key, &activityRegistry};
   eventSetupImpl.addRecordImpl(dummyRecordImpl);
   edm::ESParentContext pc;
-  const edm::EventSetup eventSetup(eventSetupImpl, 0, nullptr, pc, true);
+  const edm::EventSetup eventSetup(eventSetupImpl, 0, nullptr, pc);
   const DummyRecord& gottenRecord = eventSetup.get<DummyRecord>();
   CPPUNIT_ASSERT(&dummyRecordImpl == gottenRecord.impl_);
 }
@@ -192,7 +188,7 @@ void testEventsetup::tryToGetTest() {
   EventSetupRecordImpl dummyRecordImpl{key, &activityRegistry};
   eventSetupImpl.addRecordImpl(dummyRecordImpl);
   edm::ESParentContext pc;
-  const edm::EventSetup eventSetup(eventSetupImpl, 0, nullptr, pc, true);
+  const edm::EventSetup eventSetup(eventSetupImpl, 0, nullptr, pc);
   std::optional<DummyRecord> gottenRecord = eventSetup.tryToGet<DummyRecord>();
   CPPUNIT_ASSERT(gottenRecord);
   CPPUNIT_ASSERT(&dummyRecordImpl == gottenRecord.value().impl_);
@@ -204,7 +200,7 @@ void testEventsetup::getExcTest() {
   EventSetupProvider& provider = *controller.makeProvider(pset, &activityRegistry);
   controller.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(1)));
   edm::ESParentContext pc;
-  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, true);
+  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc);
   eventSetup.get<DummyRecord>();
 }
 
@@ -244,7 +240,7 @@ void testEventsetup::recordValidityTest() {
   Timestamp time_1(1);
   controller.eventSetupForInstance(IOVSyncValue(time_1));
   edm::ESParentContext pc;
-  const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, pc, false);
+  const edm::EventSetup eventSetup1(provider.eventSetupImpl(), 0, nullptr, pc);
   CPPUNIT_ASSERT(!eventSetup1.tryToGet<DummyRecord>().has_value());
 
   const Timestamp time_2(2);
@@ -252,7 +248,7 @@ void testEventsetup::recordValidityTest() {
   {
     controller.eventSetupForInstance(IOVSyncValue(time_2));
     edm::ESParentContext pc;
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, false);
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc);
     eventSetup.get<DummyRecord>();
     CPPUNIT_ASSERT(eventSetup.tryToGet<DummyRecord>().has_value());
   }
@@ -260,14 +256,14 @@ void testEventsetup::recordValidityTest() {
   {
     controller.eventSetupForInstance(IOVSyncValue(Timestamp(3)));
     edm::ESParentContext pc;
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, false);
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc);
     eventSetup.get<DummyRecord>();
     CPPUNIT_ASSERT(eventSetup.tryToGet<DummyRecord>().has_value());
   }
   {
     controller.eventSetupForInstance(IOVSyncValue(Timestamp(4)));
     edm::ESParentContext pc;
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, false);
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc);
     CPPUNIT_ASSERT(!eventSetup.tryToGet<DummyRecord>().has_value());
   }
 }
@@ -287,7 +283,7 @@ void testEventsetup::recordValidityExcTest() {
   Timestamp time_1(1);
   controller.eventSetupForInstance(IOVSyncValue(time_1));
   edm::ESParentContext pc;
-  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, true);
+  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc);
   eventSetup.get<DummyRecord>();
 }
 
@@ -299,7 +295,7 @@ void testEventsetup::recordValidityNoFinderTest() {
   Timestamp time_1(1);
   controller.eventSetupForInstance(IOVSyncValue(time_1));
   edm::ESParentContext pc;
-  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, false);
+  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc);
   CPPUNIT_ASSERT(!eventSetup.tryToGet<DummyRecord>().has_value());
 }
 
@@ -311,7 +307,7 @@ void testEventsetup::recordValidityNoFinderExcTest() {
   Timestamp time_1(1);
   controller.eventSetupForInstance(IOVSyncValue(time_1));
   edm::ESParentContext pc;
-  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, false);
+  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc);
   eventSetup.get<DummyRecord>();
 }
 
@@ -328,7 +324,7 @@ void testEventsetup::recordValidityProxyNoFinderTest() {
   Timestamp time_1(1);
   controller.eventSetupForInstance(IOVSyncValue(time_1));
   edm::ESParentContext pc;
-  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, true);
+  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc);
   CPPUNIT_ASSERT(!eventSetup.tryToGet<DummyRecord>().has_value());
 }
 
@@ -342,7 +338,7 @@ void testEventsetup::recordValidityProxyNoFinderExcTest() {
   Timestamp time_1(1);
   controller.eventSetupForInstance(IOVSyncValue(time_1));
   edm::ESParentContext pc;
-  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, true);
+  const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc);
   eventSetup.get<DummyRecord>();
 }
 
@@ -411,61 +407,46 @@ void testEventsetup::twoSourceTest() {
   //checking for conflicts is delayed until first eventSetupForInstance
   edm::ESParentContext pc;
   controller.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
-  const edm::EventSetup eventSetup3(provider.eventSetupImpl(), 0, nullptr, pc, false);
+  const edm::EventSetup eventSetup3(provider.eventSetupImpl(), 0, nullptr, pc);
   CPPUNIT_ASSERT(!eventSetup3.tryToGet<DummyRecord>().has_value());
   CPPUNIT_ASSERT(!eventSetup3.tryToGet<DummyEventSetupRecord>().has_value());
   controller.eventSetupForInstance(IOVSyncValue(Timestamp(3)));
-  const edm::EventSetup eventSetup4(provider.eventSetupImpl(), 0, nullptr, pc, false);
+  const edm::EventSetup eventSetup4(provider.eventSetupImpl(), 0, nullptr, pc);
   CPPUNIT_ASSERT(!eventSetup4.tryToGet<DummyRecord>().has_value());
   CPPUNIT_ASSERT(eventSetup4.tryToGet<DummyEventSetupRecord>().has_value());
   eventSetup4.get<DummyEventSetupRecord>();
 }
 
-void testEventsetup::provenanceTest() {
-  SynchronousEventSetupsController controller;
-  edm::ParameterSet pset = createDummyPset();
-  EventSetupProvider& provider = *controller.makeProvider(pset, &activityRegistry);
-
-  std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-  dummyFinder->setInterval(ValidityInterval(IOVSyncValue(Timestamp(2)), IOVSyncValue(Timestamp(3))));
-  provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummyFinder));
+namespace {
+  struct DummyDataConsumer : public EDConsumerBase {
+    explicit DummyDataConsumer(ESInputTag const& iTag) : m_token{esConsumes(iTag)} {}
 
-  try {
-    {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", true);
-      edm::ParameterSet ps;
-      ps.addParameter<std::string>("name", "test11");
-      ps.registerIt();
-      description.pid_ = ps.id();
-      auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
-      dummyProv->setDescription(description);
-      provider.add(dummyProv);
-    }
-    {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testLabel", false);
-      edm::ParameterSet ps;
-      ps.addParameter<std::string>("name", "test22");
-      ps.registerIt();
-      description.pid_ = ps.id();
-      auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
-      dummyProv->setDescription(description);
-      provider.add(dummyProv);
+    void prefetch(edm::EventSetupImpl const& iImpl) const {
+      auto const& recs = this->esGetTokenRecordIndicesVector(edm::Transition::Event);
+      auto const& proxies = this->esGetTokenIndicesVector(edm::Transition::Event);
+      for (size_t i = 0; i != proxies.size(); ++i) {
+        auto rec = iImpl.findImpl(recs[i]);
+        if (rec) {
+          edm::FinalWaitingTask waitTask;
+          tbb::task_group group;
+          rec->prefetchAsync(
+              WaitingTaskHolder(group, &waitTask), proxies[i], &iImpl, edm::ServiceToken{}, edm::ESParentContext{});
+          do {
+            group.wait();
+          } while (not waitTask.done());
+          if (waitTask.exceptionPtr()) {
+            std::rethrow_exception(*waitTask.exceptionPtr());
+          }
+        }
+      }
     }
-    controller.eventSetupForInstance(IOVSyncValue(Timestamp(2)));
-    edm::ESParentContext pc;
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, false);
-    edm::ESHandle<DummyData> data;
-    eventSetup.getData(data);
-    CPPUNIT_ASSERT(kGood.value_ == data->value_);
-    const edm::eventsetup::ComponentDescription* desc = data.description();
-    CPPUNIT_ASSERT(desc->label_ == "testLabel");
-  } catch (const cms::Exception& iException) {
-    std::cout << "caught " << iException.explainSelf() << std::endl;
-    throw;
-  }
-}
 
-void testEventsetup::getDataWithLabelTest() {
+    ESGetToken<edm::eventsetup::test::DummyData, edm::DefaultRecord> m_token;
+    ESGetToken<edm::eventsetup::test::DummyData, edm::DefaultRecord> m_tokenUninitialized;
+  };
+}  // namespace
+
+void testEventsetup::provenanceTest() {
   SynchronousEventSetupsController controller;
   edm::ParameterSet pset = createDummyPset();
   EventSetupProvider& provider = *controller.makeProvider(pset, &activityRegistry);
@@ -489,19 +470,23 @@ void testEventsetup::getDataWithLabelTest() {
       edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testLabel", false);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test22");
-      ps.addParameter<std::string>("appendToDataLabel", "blah");
       ps.registerIt();
       description.pid_ = ps.id();
       auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
       dummyProv->setDescription(description);
-      dummyProv->setAppendToDataLabel(ps);
       provider.add(dummyProv);
     }
     controller.eventSetupForInstance(IOVSyncValue(Timestamp(2)));
+    DummyDataConsumer consumer{edm::ESInputTag("", "")};
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
     edm::ESParentContext pc;
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, false);
-    edm::ESHandle<DummyData> data;
-    eventSetup.getData("blah", data);
+    const edm::EventSetup eventSetup(provider.eventSetupImpl(),
+                                     static_cast<unsigned int>(edm::Transition::Event),
+                                     consumer.esGetTokenIndices(edm::Transition::Event),
+                                     pc);
+    edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
+
     CPPUNIT_ASSERT(kGood.value_ == data->value_);
     const edm::eventsetup::ComponentDescription* desc = data.description();
     CPPUNIT_ASSERT(desc->label_ == "testLabel");
@@ -511,108 +496,7 @@ void testEventsetup::getDataWithLabelTest() {
   }
 }
 
-void testEventsetup::getDataWithESInputTagTest() {
-  SynchronousEventSetupsController controller;
-  edm::ParameterSet pset = createDummyPset();
-  EventSetupProvider& provider = *controller.makeProvider(pset, &activityRegistry);
-
-  std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-  dummyFinder->setInterval(ValidityInterval(IOVSyncValue(Timestamp(2)), IOVSyncValue(Timestamp(3))));
-  provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummyFinder));
-
-  try {
-    {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testOne", true);
-      edm::ParameterSet ps;
-      ps.addParameter<std::string>("name", "test11");
-      ps.registerIt();
-      description.pid_ = ps.id();
-      auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
-      dummyProv->setDescription(description);
-      provider.add(dummyProv);
-    }
-    {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testTwo", false);
-      edm::ParameterSet ps;
-      ps.addParameter<std::string>("name", "test22");
-      ps.addParameter<std::string>("appendToDataLabel", "blah");
-      ps.registerIt();
-      description.pid_ = ps.id();
-      auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
-      dummyProv->setDescription(description);
-      dummyProv->setAppendToDataLabel(ps);
-      provider.add(dummyProv);
-    }
-    controller.eventSetupForInstance(IOVSyncValue(Timestamp(2)));
-    edm::ESParentContext pc;
-    const edm::EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, false);
-    {
-      edm::ESHandle<DummyData> data;
-      edm::ESInputTag blahTag("", "blah");
-      eventSetup.getData(blahTag, data);
-      CPPUNIT_ASSERT(kGood.value_ == data->value_);
-      const edm::eventsetup::ComponentDescription* desc = data.description();
-      CPPUNIT_ASSERT(desc->label_ == "testTwo");
-    }
-
-    {
-      edm::ESHandle<DummyData> data;
-      edm::ESInputTag nullTag("", "");
-      eventSetup.getData(nullTag, data);
-      CPPUNIT_ASSERT(kBad.value_ == data->value_);
-      const edm::eventsetup::ComponentDescription* desc = data.description();
-      CPPUNIT_ASSERT(desc->label_ == "testOne");
-    }
-
-    {
-      edm::ESHandle<DummyData> data;
-      edm::ESInputTag blahTag("testTwo", "blah");
-      eventSetup.getData(blahTag, data);
-      CPPUNIT_ASSERT(kGood.value_ == data->value_);
-      const edm::eventsetup::ComponentDescription* desc = data.description();
-      CPPUNIT_ASSERT(desc->label_ == "testTwo");
-    }
-
-    {
-      edm::ESHandle<DummyData> data;
-      edm::ESInputTag badTag("DoesNotExist", "blah");
-      CPPUNIT_ASSERT_THROW(eventSetup.getData(badTag, data), cms::Exception);
-    }
-
-  } catch (const cms::Exception& iException) {
-    std::cout << "caught " << iException.explainSelf() << std::endl;
-    throw;
-  }
-}
-
 namespace {
-  struct DummyDataConsumer : public EDConsumerBase {
-    explicit DummyDataConsumer(ESInputTag const& iTag) : m_token{esConsumes(iTag)} {}
-
-    void prefetch(edm::EventSetupImpl const& iImpl) const {
-      auto const& recs = this->esGetTokenRecordIndicesVector(edm::Transition::Event);
-      auto const& proxies = this->esGetTokenIndicesVector(edm::Transition::Event);
-      for (size_t i = 0; i != proxies.size(); ++i) {
-        auto rec = iImpl.findImpl(recs[i]);
-        if (rec) {
-          edm::FinalWaitingTask waitTask;
-          tbb::task_group group;
-          rec->prefetchAsync(
-              WaitingTaskHolder(group, &waitTask), proxies[i], &iImpl, edm::ServiceToken{}, edm::ESParentContext{});
-          do {
-            group.wait();
-          } while (not waitTask.done());
-          if (waitTask.exceptionPtr()) {
-            std::rethrow_exception(*waitTask.exceptionPtr());
-          }
-        }
-      }
-    }
-
-    ESGetToken<edm::eventsetup::test::DummyData, edm::DefaultRecord> m_token;
-    ESGetToken<edm::eventsetup::test::DummyData, edm::DefaultRecord> m_tokenUninitialized;
-  };
-
   //This just tests that the constructs will properly compile
   class [[maybe_unused]] EDConsumesCollectorConsumer : public edm::EDConsumerBase {
     EDConsumesCollectorConsumer() {
@@ -829,8 +713,7 @@ void testEventsetup::getDataWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       auto const& data = eventSetup.getData(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data.value_);
       bool uninitializedTokenThrewException = false;
@@ -850,8 +733,7 @@ void testEventsetup::getDataWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       const DummyData& data = eventSetup.getData(consumer.m_token);
       CPPUNIT_ASSERT(kBad.value_ == data.value_);
     }
@@ -863,8 +745,7 @@ void testEventsetup::getDataWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       auto const& data = eventSetup.getData(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data.value_);
     }
@@ -876,8 +757,7 @@ void testEventsetup::getDataWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       CPPUNIT_ASSERT_THROW(eventSetup.getData(consumer.m_token), cms::Exception);
     }
 
@@ -888,8 +768,7 @@ void testEventsetup::getDataWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       const DummyData& data = eventSetup.getData(consumer.m_token);
       CPPUNIT_ASSERT(kBad.value_ == data.value_);
     }
@@ -900,8 +779,7 @@ void testEventsetup::getDataWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       const DummyData& data = eventSetup.getData(consumer.m_token);
       CPPUNIT_ASSERT(kBad.value_ == data.value_);
     }
@@ -912,8 +790,7 @@ void testEventsetup::getDataWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       CPPUNIT_ASSERT_THROW(eventSetup.getData(consumer.m_token), edm::eventsetup::MakeDataException);
     }
     {
@@ -923,8 +800,7 @@ void testEventsetup::getDataWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       const DummyData& data = eventSetup.getData(consumer.m_token);
       CPPUNIT_ASSERT(kBad.value_ == data.value_);
     }
@@ -977,8 +853,7 @@ void testEventsetup::getHandleWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
@@ -992,8 +867,7 @@ void testEventsetup::getHandleWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
       CPPUNIT_ASSERT(kBad.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
@@ -1007,8 +881,7 @@ void testEventsetup::getHandleWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
@@ -1022,8 +895,7 @@ void testEventsetup::getHandleWithESGetTokenTest() {
       EventSetup eventSetup{provider.eventSetupImpl(),
                             static_cast<unsigned int>(edm::Transition::Event),
                             consumer.esGetTokenIndices(edm::Transition::Event),
-                            pc,
-                            true};
+                            pc};
       CPPUNIT_ASSERT(not eventSetup.getHandle(consumer.m_token));
       CPPUNIT_ASSERT_THROW(*eventSetup.getHandle(consumer.m_token), cms::Exception);
     }
@@ -1081,8 +953,7 @@ void testEventsetup::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       pc,
-                                       true};
+                                       pc};
       edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
@@ -1096,8 +967,7 @@ void testEventsetup::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       pc,
-                                       true};
+                                       pc};
       edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
       CPPUNIT_ASSERT(kBad.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
@@ -1111,8 +981,7 @@ void testEventsetup::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       pc,
-                                       true};
+                                       pc};
       edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
@@ -1126,8 +995,7 @@ void testEventsetup::getTransientHandleWithESGetTokenTest() {
       const edm::EventSetup eventSetup{provider.eventSetupImpl(),
                                        static_cast<unsigned int>(edm::Transition::Event),
                                        consumer.esGetTokenIndices(edm::Transition::Event),
-                                       pc,
-                                       true};
+                                       pc};
       edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
       CPPUNIT_ASSERT(not data);
       CPPUNIT_ASSERT_THROW(*data, cms::Exception);
@@ -1163,9 +1031,14 @@ void testEventsetup::sourceProducerResolutionTest() {
       provider.add(dummyProv);
     }
     controller.eventSetupForInstance(IOVSyncValue(Timestamp(2)));
-    const EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, false};
-    edm::ESHandle<DummyData> data;
-    eventSetup.getData(data);
+    DummyDataConsumer consumer{edm::ESInputTag("", "")};
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    const EventSetup eventSetup{provider.eventSetupImpl(),
+                                static_cast<unsigned int>(edm::Transition::Event),
+                                consumer.esGetTokenIndices(edm::Transition::Event),
+                                pc};
+    edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(kGood.value_ == data->value_);
   }
 
@@ -1192,9 +1065,14 @@ void testEventsetup::sourceProducerResolutionTest() {
     }
     controller.eventSetupForInstance(IOVSyncValue(Timestamp(2)));
     ESParentContext pc;
-    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, false};
-    edm::ESHandle<DummyData> data;
-    eventSetup.getData(data);
+    DummyDataConsumer consumer{edm::ESInputTag("", "")};
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    EventSetup eventSetup{provider.eventSetupImpl(),
+                          static_cast<unsigned int>(edm::Transition::Event),
+                          consumer.esGetTokenIndices(edm::Transition::Event),
+                          pc};
+    edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(kGood.value_ == data->value_);
   }
 }
@@ -1230,9 +1108,14 @@ void testEventsetup::preferTest() {
         provider.add(dummyProv);
       }
       controller.eventSetupForInstance(IOVSyncValue(Timestamp(2)));
-      EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, false};
-      edm::ESHandle<DummyData> data;
-      eventSetup.getData(data);
+      DummyDataConsumer consumer{edm::ESInputTag("", "")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      consumer.prefetch(provider.eventSetupImpl());
+      EventSetup eventSetup{provider.eventSetupImpl(),
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event),
+                            pc};
+      edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data->value_);
     }
 
@@ -1260,9 +1143,14 @@ void testEventsetup::preferTest() {
         provider.add(dummyProv);
       }
       controller.eventSetupForInstance(IOVSyncValue(Timestamp(2)));
-      EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, false};
-      edm::ESHandle<DummyData> data;
-      eventSetup.getData(data);
+      DummyDataConsumer consumer{edm::ESInputTag("", "")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      consumer.prefetch(provider.eventSetupImpl());
+      EventSetup eventSetup{provider.eventSetupImpl(),
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event),
+                            pc};
+      edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data->value_);
     }
 
@@ -1291,9 +1179,14 @@ void testEventsetup::preferTest() {
         provider.add(dummyProv);
       }
       controller.eventSetupForInstance(IOVSyncValue(Timestamp(2)));
-      EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, false};
-      edm::ESHandle<DummyData> data;
-      eventSetup.getData(data);
+      DummyDataConsumer consumer{edm::ESInputTag("", "")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      consumer.prefetch(provider.eventSetupImpl());
+      EventSetup eventSetup{provider.eventSetupImpl(),
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event),
+                            pc};
+      edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
       CPPUNIT_ASSERT(kGood.value_ == data->value_);
     }
 
@@ -1324,20 +1217,10 @@ void testEventsetup::introspectionTest() {
       dummyProv->setDescription(description);
       provider.add(dummyProv);
     }
-    {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", false);
-      edm::ParameterSet ps;
-      ps.addParameter<std::string>("name", "test22");
-      ps.registerIt();
-      description.pid_ = ps.id();
-      auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
-      dummyProv->setDescription(description);
-      provider.add(dummyProv);
-    }
     EventSetupRecordKey dummyRecordKey = EventSetupRecordKey::makeKey<DummyRecord>();
     controller.eventSetupForInstance(IOVSyncValue(Timestamp(2)));
     {
-      EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, true};
+      EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc};
 
       CPPUNIT_ASSERT(eventSetup.recordIsProvidedByAModule(dummyRecordKey));
       std::vector<edm::eventsetup::EventSetupRecordKey> recordKeys;
@@ -1352,7 +1235,7 @@ void testEventsetup::introspectionTest() {
     // EventSetupImpl but has a null pointer.
     controller.eventSetupForInstance(IOVSyncValue(Timestamp(4)));
     {
-      EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, true};
+      EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc};
 
       CPPUNIT_ASSERT(eventSetup.recordIsProvidedByAModule(dummyRecordKey));
       std::vector<edm::eventsetup::EventSetupRecordKey> recordKeys;
@@ -1385,12 +1268,12 @@ void testEventsetup::iovExtensionTest() {
   edm::ESParentContext pc;
   {
     controller.eventSetupForInstance(IOVSyncValue{Timestamp(2)});
-    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, true};
+    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc};
     CPPUNIT_ASSERT(2 == eventSetup.get<DummyRecord>().cacheIdentifier());
   }
   {
     controller.eventSetupForInstance(IOVSyncValue{Timestamp(3)});
-    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, true};
+    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc};
     eventSetup.get<DummyRecord>();
     CPPUNIT_ASSERT(2 == eventSetup.get<DummyRecord>().cacheIdentifier());
   }
@@ -1398,7 +1281,7 @@ void testEventsetup::iovExtensionTest() {
   finder->setInterval(ValidityInterval(IOVSyncValue{Timestamp{2}}, IOVSyncValue{Timestamp{4}}));
   {
     controller.eventSetupForInstance(IOVSyncValue{Timestamp(4)});
-    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, true};
+    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc};
     CPPUNIT_ASSERT(2 == eventSetup.get<DummyRecord>().cacheIdentifier());
   }
 
@@ -1406,7 +1289,7 @@ void testEventsetup::iovExtensionTest() {
   finder->setInterval(ValidityInterval(IOVSyncValue{Timestamp{5}}, IOVSyncValue{Timestamp{6}}));
   {
     controller.eventSetupForInstance(IOVSyncValue{Timestamp(5)});
-    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, true};
+    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc};
     CPPUNIT_ASSERT(3 == eventSetup.get<DummyRecord>().cacheIdentifier());
   }
 }
@@ -1433,21 +1316,31 @@ void testEventsetup::resetProxiesTest() {
   edm::ESParentContext pc;
   {
     controller.eventSetupForInstance(IOVSyncValue{Timestamp(2)});
-    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, false};
+    DummyDataConsumer consumer{edm::ESInputTag("", "")};
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    EventSetup eventSetup{provider.eventSetupImpl(),
+                          static_cast<unsigned int>(edm::Transition::Event),
+                          consumer.esGetTokenIndices(edm::Transition::Event),
+                          pc};
     CPPUNIT_ASSERT(2 == eventSetup.get<DummyRecord>().cacheIdentifier());
-    edm::ESHandle<DummyData> data;
-    eventSetup.getData(data);
+    edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(data->value_ == 1);
   }
   provider.forceCacheClear();
   {
     controller.eventSetupForInstance(IOVSyncValue{Timestamp(2)});
-    EventSetup eventSetup{provider.eventSetupImpl(), 0, nullptr, pc, false};
+    DummyDataConsumer consumer{edm::ESInputTag("", "")};
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    EventSetup eventSetup{provider.eventSetupImpl(),
+                          static_cast<unsigned int>(edm::Transition::Event),
+                          consumer.esGetTokenIndices(edm::Transition::Event),
+                          pc};
     eventSetup.get<DummyRecord>();
     CPPUNIT_ASSERT(3 == eventSetup.get<DummyRecord>().cacheIdentifier());
     dummyProv->incrementData();
-    edm::ESHandle<DummyData> data;
-    eventSetup.getData(data);
+    edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(data->value_ == 2);
   }
 }
diff --git a/FWCore/Framework/test/eventsetuprecord_t.cppunit.cc b/FWCore/Framework/test/eventsetuprecord_t.cppunit.cc
index 49dd7fdd0ac03..47eb8076b8b2f 100644
--- a/FWCore/Framework/test/eventsetuprecord_t.cppunit.cc
+++ b/FWCore/Framework/test/eventsetuprecord_t.cppunit.cc
@@ -8,6 +8,7 @@
 
 #include "cppunit/extensions/HelperMacros.h"
 
+#include "FWCore/Framework/interface/ESConsumesCollector.h"
 #include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 #include "FWCore/Framework/interface/EventSetupRecord.h"
 #include "FWCore/Framework/interface/EventSetupRecordImpl.h"
@@ -64,7 +65,6 @@ class testEventsetupRecord : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testEventsetupRecord);
 
   CPPUNIT_TEST(proxyTest);
-  CPPUNIT_TEST(getTest);
   CPPUNIT_TEST(getHandleTest);
   CPPUNIT_TEST(getWithTokenTest);
   CPPUNIT_TEST(doGetTest);
@@ -84,7 +84,6 @@ class testEventsetupRecord : public CppUnit::TestFixture {
   void tearDown() {}
 
   void proxyTest();
-  void getTest();
   void getHandleTest();
   void getWithTokenTest();
   void doGetTest();
@@ -184,75 +183,6 @@ void testEventsetupRecord::proxyTest() {
   CPPUNIT_ASSERT(nullptr == dummyRecord.find(dummyFredDataKey));
 }
 
-void testEventsetupRecord::getTest() {
-  eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_, &activityRegistry};
-
-  FailingDummyProxy dummyProxy;
-
-  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
-
-  DummyRecord dummyRecord;
-  ESParentContext pc;
-  dummyRecord.setImpl(&dummyRecordImpl, 0, nullptr, &eventSetupImpl_, &pc, false);
-  ESHandle<Dummy> dummyPtr;
-  CPPUNIT_ASSERT(not dummyRecord.get(dummyPtr));
-  CPPUNIT_ASSERT(not dummyPtr.isValid());
-  CPPUNIT_ASSERT(not dummyPtr);
-  CPPUNIT_ASSERT(dummyPtr.failedToGet());
-  CPPUNIT_ASSERT_THROW(*dummyPtr, NoDataExceptionType);
-  CPPUNIT_ASSERT_THROW(makeESValid(dummyPtr), cms::Exception);
-  //CDJ do this replace
-  //CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr),NoDataExceptionType);
-
-  dummyRecordImpl.add(dummyDataKey, &dummyProxy);
-
-  //dummyRecord.get(dummyPtr);
-  CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr), ExceptionType);
-
-  Dummy myDummy;
-  WorkingDummyProxy workingProxy(&myDummy);
-  ComponentDescription cd;
-  cd.label_ = "";
-  cd.type_ = "DummyProd";
-  workingProxy.setProviderDescription(&cd);
-
-  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "working");
-
-  dummyRecordImpl.add(workingDataKey, &workingProxy);
-
-  dummyRecord.get("working", dummyPtr);
-  CPPUNIT_ASSERT(!dummyPtr.failedToGet());
-  CPPUNIT_ASSERT(dummyPtr.isValid());
-  CPPUNIT_ASSERT(dummyPtr);
-  (void)makeESValid(dummyPtr);
-
-  CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-
-  const std::string workingString("working");
-  dummyRecord.get(workingString, dummyPtr);
-  CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-
-  edm::ESInputTag it_working("", "working");
-  dummyRecord.get(it_working, dummyPtr);
-  CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-
-  edm::ESInputTag it_prov("DummyProd", "working");
-  dummyRecord.get(it_prov, dummyPtr);
-  CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-
-  edm::ESInputTag it_bad("SmartProd", "working");
-  CPPUNIT_ASSERT_THROW(dummyRecord.get(it_bad, dummyPtr), cms::Exception);
-
-  //check if label is set
-  cd.label_ = "foo";
-  edm::ESInputTag it_label("foo", "working");
-  dummyRecord.get(it_label, dummyPtr);
-  CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-
-  edm::ESInputTag it_prov_bad("DummyProd", "working");
-  CPPUNIT_ASSERT_THROW(dummyRecord.get(it_prov_bad, dummyPtr), cms::Exception);
-}
-
 namespace {
   struct DummyDataConsumer : public EDConsumerBase {
     explicit DummyDataConsumer(ESInputTag const& iTag) : m_token{esConsumes(iTag)} {}
@@ -309,6 +239,8 @@ namespace {
     CONSUMER& consumer;
     //we need the DataKeys to stick around since references are being kept to them
     std::vector<std::pair<edm::eventsetup::DataKey, edm::eventsetup::DataProxy*>> proxies;
+    // same for ESParentContext
+    ESParentContext pc_;
 
     SetupRecordT(CONSUMER& iConsumer,
                  EventSetupRecordKey const& iKey,
@@ -335,9 +267,7 @@ namespace {
 
     DummyRecord makeRecord() {
       DummyRecord ret;
-      ESParentContext pc;
-      ret.setImpl(
-          &dummyRecordImpl, 0, consumer.esGetTokenIndices(edm::Transition::Event), &eventSetupImpl_, &pc, false);
+      ret.setImpl(&dummyRecordImpl, 0, consumer.esGetTokenIndices(edm::Transition::Event), &eventSetupImpl_, &pc_);
       return ret;
     }
   };
@@ -550,15 +480,20 @@ void testEventsetupRecord::getWithTokenTest() {
 }
 
 void testEventsetupRecord::getNodataExpTest() {
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
+
+  edm::ESConsumesInfo consumesInfo;
+  edm::ESConsumesCollectorT<DummyRecord> cc(&consumesInfo, static_cast<unsigned int>(edm::Transition::Event));
+  auto token = cc.consumes<Dummy>();
+  std::vector<edm::ESProxyIndex> getTokenIndices{eventsetup::ESRecordsToProxyIndices::missingProxyIndex()};
+
   EventSetupRecordImpl recImpl(DummyRecord::keyForClass(), &activityRegistry);
   DummyRecord dummyRecord;
   ESParentContext pc;
-  dummyRecord.setImpl(&recImpl, 0, nullptr, &eventSetupImpl_, &pc, false);
+  dummyRecord.setImpl(&recImpl, 0, getTokenIndices.data(), &eventSetupImpl_, &pc);
   FailingDummyProxy dummyProxy;
 
-  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
-  ESHandle<Dummy> dummyPtr;
-  dummyRecord.get(dummyPtr);
+  ESHandle<Dummy> dummyPtr = dummyRecord.getHandle(token);
   *dummyPtr;
 }
 
@@ -566,16 +501,19 @@ void testEventsetupRecord::getExepTest() {
   eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_, &activityRegistry};
   FailingDummyProxy dummyProxy;
 
-  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
+  edm::ESConsumesInfo consumesInfo;
+  edm::ESConsumesCollectorT<DummyRecord> cc(&consumesInfo, static_cast<unsigned int>(edm::Transition::Event));
+  auto token = cc.consumes<Dummy>();
+  std::vector<edm::ESProxyIndex> getTokenIndices{eventsetup::ESRecordsToProxyIndices::missingProxyIndex()};
 
-  ESHandle<Dummy> dummyPtr;
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
 
   dummyRecordImpl.add(dummyDataKey, &dummyProxy);
 
   DummyRecord dummyRecord;
   ESParentContext pc;
-  dummyRecord.setImpl(&dummyRecordImpl, 0, nullptr, &eventSetupImpl_, &pc, false);
-  dummyRecord.get(dummyPtr);
+  dummyRecord.setImpl(&dummyRecordImpl, 0, getTokenIndices.data(), &eventSetupImpl_, &pc);
+  ESHandle<Dummy> dummyPtr = dummyRecord.getHandle(token);
   //CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr), ExceptionType);
 }
 
@@ -648,7 +586,7 @@ void testEventsetupRecord::introspectionTest() {
 
   DummyRecord dummyRecord;
   ESParentContext pc;
-  dummyRecord.setImpl(&dummyRecordImpl, 0, nullptr, &eventSetupImpl_, &pc, false);
+  dummyRecord.setImpl(&dummyRecordImpl, 0, nullptr, &eventSetupImpl_, &pc);
 
   std::vector<ComponentDescription const*> esproducers;
   dummyRecordImpl.getESProducers(esproducers);
@@ -786,9 +724,14 @@ void testEventsetupRecord::proxyResetTest() {
 
   EventSetupRecordProvider const* constRecordProvider = dummyProvider.get();
 
+  edm::ESConsumesInfo consumesInfo;
+  edm::ESConsumesCollectorT<DummyRecord> cc(&consumesInfo, static_cast<unsigned int>(edm::Transition::Event));
+  auto token = cc.consumes<Dummy>();
+  std::vector<edm::ESProxyIndex> getTokenIndices{edm::ESProxyIndex(0)};
+
   DummyRecord dummyRecord;
   ESParentContext pc;
-  dummyRecord.setImpl(&constRecordProvider->firstRecordImpl(), 0, nullptr, &eventSetupImpl_, &pc, false);
+  dummyRecord.setImpl(&constRecordProvider->firstRecordImpl(), 0, getTokenIndices.data(), &eventSetupImpl_, &pc);
 
   Dummy myDummy;
   std::shared_ptr<WorkingDummyProxy> workingProxy = std::make_shared<WorkingDummyProxy>(&myDummy);
@@ -806,8 +749,7 @@ void testEventsetupRecord::proxyResetTest() {
   edm::eventsetup::EventSetupRecordProvider::DataToPreferredProviderMap pref;
   dummyProvider->usePreferred(pref);
 
-  edm::ESHandle<Dummy> hDummy;
-  dummyRecord.get(hDummy);
+  edm::ESHandle<Dummy> hDummy = dummyRecord.getHandle(token);
 
   CPPUNIT_ASSERT(&myDummy == &(*hDummy));
 
@@ -815,7 +757,7 @@ void testEventsetupRecord::proxyResetTest() {
   workingProxy->set(&myDummy2);
 
   //should not change
-  dummyRecord.get(hDummy);
+  hDummy = dummyRecord.getHandle(token);
   CPPUNIT_ASSERT(&myDummy == &(*hDummy));
   CPPUNIT_ASSERT(!workingProxy->invalidateCalled());
   CPPUNIT_ASSERT(!workingProxy->invalidateTransientCalled());
@@ -823,7 +765,7 @@ void testEventsetupRecord::proxyResetTest() {
   dummyProvider->resetProxies();
   CPPUNIT_ASSERT(workingProxy->invalidateCalled());
   CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled());
-  dummyRecord.get(hDummy);
+  hDummy = dummyRecord.getHandle(token);
   CPPUNIT_ASSERT(&myDummy2 == &(*hDummy));
   CPPUNIT_ASSERT(!workingProxy->invalidateCalled());
   CPPUNIT_ASSERT(!workingProxy->invalidateTransientCalled());
@@ -835,9 +777,16 @@ void testEventsetupRecord::transientTest() {
 
   auto dummyProvider = std::make_unique<EventSetupRecordProvider>(DummyRecord::keyForClass(), &activityRegistry);
 
+  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "");
+
+  edm::ESConsumesInfo consumesInfo;
+  edm::ESConsumesCollectorT<DummyRecord> cc(&consumesInfo, static_cast<unsigned int>(edm::Transition::Event));
+  auto token = cc.consumes<Dummy>();
+  std::vector<edm::ESProxyIndex> getTokenIndices{edm::ESProxyIndex(0)};
+
   DummyRecord dummyRecordNoConst;
   ESParentContext pc;
-  dummyRecordNoConst.setImpl(&dummyProvider->firstRecordImpl(), 0, nullptr, &eventSetupImpl_, &pc, false);
+  dummyRecordNoConst.setImpl(&dummyProvider->firstRecordImpl(), 0, getTokenIndices.data(), &eventSetupImpl_, &pc);
   EventSetupRecord const& dummyRecord = dummyRecordNoConst;
 
   eventsetup::EventSetupRecordImpl& nonConstDummyRecordImpl = *const_cast<EventSetupRecordImpl*>(dummyRecord.impl_);
@@ -845,8 +794,6 @@ void testEventsetupRecord::transientTest() {
   Dummy myDummy;
   std::shared_ptr<WorkingDummyProxy> workingProxy = std::make_shared<WorkingDummyProxy>(&myDummy);
 
-  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "");
-
   std::shared_ptr<WorkingDummyProvider> wdProv = std::make_shared<WorkingDummyProvider>(workingDataKey, workingProxy);
   wdProv->createKeyedProxies(DummyRecord::keyForClass(), 1);
   dummyProvider->add(wdProv);
@@ -858,7 +805,7 @@ void testEventsetupRecord::transientTest() {
   //do a transient access to see if it clears properly
   edm::ESTransientHandle<Dummy> hTDummy;
   CPPUNIT_ASSERT(hTDummy.transientAccessOnly);
-  dummyRecord.get(hTDummy);
+  hTDummy = dummyRecord.getHandleImpl<edm::ESTransientHandle>(token);
 
   CPPUNIT_ASSERT(&myDummy == &(*hTDummy));
   CPPUNIT_ASSERT(workingProxy->invalidateCalled() == false);
@@ -872,18 +819,17 @@ void testEventsetupRecord::transientTest() {
   workingProxy->set(&myDummy2);
 
   //do non-transient access to make sure nothing resets now
-  edm::ESHandle<Dummy> hDummy;
-  dummyRecord.get(hDummy);
+  edm::ESHandle<Dummy> hDummy = dummyRecord.getHandleImpl<edm::ESHandle>(token);
 
-  dummyRecord.get(hDummy);
+  hDummy = dummyRecord.getHandleImpl<edm::ESHandle>(token);
   CPPUNIT_ASSERT(&myDummy2 == &(*hDummy));
   nonConstDummyRecordImpl.resetIfTransientInProxies();
   CPPUNIT_ASSERT(workingProxy->invalidateCalled() == false);
   CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled() == false);
 
   //do another transient access which should not do a reset since we have a non-transient access outstanding
-  dummyRecord.get(hDummy);
-  dummyRecord.get(hTDummy);
+  hDummy = dummyRecord.getHandleImpl<edm::ESHandle>(token);
+  hTDummy = dummyRecord.getHandleImpl<edm::ESTransientHandle>(token);
 
   nonConstDummyRecordImpl.resetIfTransientInProxies();
   CPPUNIT_ASSERT(workingProxy->invalidateCalled() == false);
@@ -895,8 +841,8 @@ void testEventsetupRecord::transientTest() {
     Dummy myDummy3;
     workingProxy->set(&myDummy3);
 
-    dummyRecord.get(hTDummy);
-    dummyRecord.get(hDummy);
+    hDummy = dummyRecord.getHandleImpl<edm::ESHandle>(token);
+    hTDummy = dummyRecord.getHandleImpl<edm::ESTransientHandle>(token);
 
     CPPUNIT_ASSERT(&myDummy3 == &(*hDummy));
     CPPUNIT_ASSERT(&myDummy3 == &(*hTDummy));
diff --git a/FWCore/Framework/test/fullchain_t.cppunit.cc b/FWCore/Framework/test/fullchain_t.cppunit.cc
index b880947e29903..c3ef8d33a1f00 100644
--- a/FWCore/Framework/test/fullchain_t.cppunit.cc
+++ b/FWCore/Framework/test/fullchain_t.cppunit.cc
@@ -11,7 +11,9 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/EventSetupProvider.h"
 #include "FWCore/Framework/interface/IOVSyncValue.h"
+#include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 #include "FWCore/Framework/interface/ValidityInterval.h"
 
 #include "FWCore/Framework/test/DummyData.h"
@@ -44,6 +46,32 @@ namespace {
     pset.addParameter<std::vector<std::string>>("@all_esmodules", emptyVStrings);
     return pset;
   }
+
+  struct DummyDataConsumer : public EDConsumerBase {
+    explicit DummyDataConsumer() : m_token{esConsumes()} {}
+
+    void prefetch(edm::EventSetupImpl const& iImpl) const {
+      auto const& recs = this->esGetTokenRecordIndicesVector(edm::Transition::Event);
+      auto const& proxies = this->esGetTokenIndicesVector(edm::Transition::Event);
+      for (size_t i = 0; i != proxies.size(); ++i) {
+        auto rec = iImpl.findImpl(recs[i]);
+        if (rec) {
+          edm::FinalWaitingTask waitTask;
+          tbb::task_group group;
+          rec->prefetchAsync(
+              WaitingTaskHolder(group, &waitTask), proxies[i], &iImpl, edm::ServiceToken{}, edm::ESParentContext{});
+          do {
+            group.wait();
+          } while (not waitTask.done());
+          if (waitTask.exceptionPtr()) {
+            std::rethrow_exception(*waitTask.exceptionPtr());
+          }
+        }
+      }
+    }
+
+    ESGetToken<edm::eventsetup::test::DummyData, edm::DefaultRecord> m_token;
+  };
 }  // namespace
 
 class testfullChain : public CppUnit::TestFixture {
@@ -82,12 +110,17 @@ void testfullChain::getfromDataproxyproviderTest() {
   for (unsigned int iTime = 1; iTime != 6; ++iTime) {
     const Timestamp time(iTime);
     controller.eventSetupForInstance(IOVSyncValue(time));
-    EventSetup eventSetup(provider.eventSetupImpl(), 0, nullptr, pc, false);
-    ESHandle<DummyData> pDummy;
-    eventSetup.get<DummyRecord>().get(pDummy);
+    DummyDataConsumer consumer;
+    consumer.updateLookup(provider.recordsToProxyIndices());
+    consumer.prefetch(provider.eventSetupImpl());
+    EventSetup eventSetup(provider.eventSetupImpl(),
+                          static_cast<unsigned int>(edm::Transition::Event),
+                          consumer.esGetTokenIndices(edm::Transition::Event),
+                          pc);
+    ESHandle<DummyData> pDummy = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(0 != pDummy.product());
 
-    eventSetup.getData(pDummy);
+    pDummy = eventSetup.getHandle(consumer.m_token);
     CPPUNIT_ASSERT(0 != pDummy.product());
   }
 }
diff --git a/FWCore/Framework/test/run_test_1_thread_es_prefetching.sh b/FWCore/Framework/test/run_test_1_thread_es_prefetching.sh
index 8e699db91d064..cd989711096b1 100755
--- a/FWCore/Framework/test/run_test_1_thread_es_prefetching.sh
+++ b/FWCore/Framework/test/run_test_1_thread_es_prefetching.sh
@@ -5,6 +5,4 @@ function die { echo $1: status $2 ;  exit $2; }
 
 TEST_DIR=src/FWCore/Framework/test
 
-(cmsRun ${TEST_DIR}/test_1_thread_es_mixed_prefetch_cfg.py 2>&1) | grep 'Maximum concurrent running modules: 1' || die "grep failed to find 'Maximum concurrent running modules: 1'" $?
-(cmsRun ${TEST_DIR}/test_1_thread_es_no_prefetch_cfg.py 2>&1) | grep 'Maximum concurrent running modules: 1' || die "grep failed to find 'Maximum concurrent running modules: 1'" $?
 (cmsRun ${TEST_DIR}/test_1_thread_es_prefetch_cfg.py 2>&1) | grep 'Maximum concurrent running modules: 1' || die "grep failed to find 'Maximum concurrent running modules: 1'" $?
diff --git a/FWCore/Framework/test/stubs/TestESDummyDataAnalyzer.cc b/FWCore/Framework/test/stubs/TestESDummyDataAnalyzer.cc
index ddad32010c284..595b3d6cd08d2 100644
--- a/FWCore/Framework/test/stubs/TestESDummyDataAnalyzer.cc
+++ b/FWCore/Framework/test/stubs/TestESDummyDataAnalyzer.cc
@@ -92,28 +92,4 @@ void TestESDummyDataAnalyzer::endJob() {
   }
 }
 
-class TestESDummyDataNoPrefetchAnalyzer : public edm::one::EDAnalyzer<edm::RunCache<DummyRunCache>> {
-public:
-  explicit TestESDummyDataNoPrefetchAnalyzer(const edm::ParameterSet&) {}
-
-private:
-  std::shared_ptr<DummyRunCache> globalBeginRun(const edm::Run&, const edm::EventSetup&) const override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void globalEndRun(const edm::Run&, const edm::EventSetup&) override {}
-};
-
-std::shared_ptr<DummyRunCache> TestESDummyDataNoPrefetchAnalyzer::globalBeginRun(const edm::Run&,
-                                                                                 const edm::EventSetup& iES) const {
-  edm::ESHandle<edm::eventsetup::test::DummyData> h;
-  iES.getData(h);
-  *h;
-  return {};
-}
-void TestESDummyDataNoPrefetchAnalyzer::analyze(const edm::Event&, const edm::EventSetup& iES) {
-  edm::ESHandle<edm::eventsetup::test::DummyData> h;
-  iES.getData(h);
-  *h;
-}
-
 DEFINE_FWK_MODULE(TestESDummyDataAnalyzer);
-DEFINE_FWK_MODULE(TestESDummyDataNoPrefetchAnalyzer);
diff --git a/FWCore/Framework/test/test_1_thread_es_mixed_prefetch_cfg.py b/FWCore/Framework/test/test_1_thread_es_mixed_prefetch_cfg.py
deleted file mode 100644
index c3b89cdd18dc2..0000000000000
--- a/FWCore/Framework/test/test_1_thread_es_mixed_prefetch_cfg.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-process = cms.Process("Test")
-
-process.source = cms.Source("EmptySource")
-
-process.maxEvents.input = 1
-
-process.b = cms.EDProducer("edmtest::one::WatchRunsProducer",
-                           transitions = cms.int32(3))
-process.c = cms.EDAnalyzer("TestESDummyDataAnalyzer",
-                           expected = cms.int32(5))
-process.a = cms.EDAnalyzer("TestESDummyDataNoPrefetchAnalyzer")
-
-process.add_(cms.ESProducer("LoadableDummyProvider",
-                            value = cms.untracked.int32(5)))
-
-process.essource = cms.ESSource("EmptyESSource",
-    recordName = cms.string('DummyRecord'),
-    iovIsRunNotTime = cms.bool(True),
-    firstValid = cms.vuint32(1)
-)
-
-process.p1 = cms.Path(process.a)
-process.p2 = cms.Path(process.b)
-process.p3 = cms.Path(process.c)
-
-#process.add_(cms.Service("Tracer"))
-
-process.add_(cms.Service("ConcurrentModuleTimer", padding = cms.untracked.uint32(2), trackGlobalBeginRun = cms.untracked.bool(True)))
diff --git a/FWCore/Framework/test/test_1_thread_es_no_prefetch_cfg.py b/FWCore/Framework/test/test_1_thread_es_no_prefetch_cfg.py
deleted file mode 100644
index c3490503a19ae..0000000000000
--- a/FWCore/Framework/test/test_1_thread_es_no_prefetch_cfg.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-process = cms.Process("Test")
-
-process.source = cms.Source("EmptySource")
-
-process.maxEvents.input = 1
-
-process.b = cms.EDProducer("edmtest::one::WatchRunsProducer",
-                           transitions = cms.int32(3))
-process.a = cms.EDAnalyzer("TestESDummyDataNoPrefetchAnalyzer")
-
-process.add_(cms.ESProducer("LoadableDummyProvider",
-                            value = cms.untracked.int32(5)))
-
-process.essource = cms.ESSource("EmptyESSource",
-    recordName = cms.string('DummyRecord'),
-    iovIsRunNotTime = cms.bool(True),
-    firstValid = cms.vuint32(1)
-)
-
-process.p1 = cms.Path(process.a)
-process.p2 = cms.Path(process.b)
-
-#process.add_(cms.Service("Tracer"))
-
-process.add_(cms.Service("ConcurrentModuleTimer", padding = cms.untracked.uint32(2), trackGlobalBeginRun = cms.untracked.bool(True)))