diff --git a/DataFormats/Candidate/src/classes.h b/DataFormats/Candidate/src/classes.h
index 7050147f177a8..21bfe06c8faeb 100644
--- a/DataFormats/Candidate/src/classes.h
+++ b/DataFormats/Candidate/src/classes.h
@@ -20,6 +20,7 @@
 #include "DataFormats/Common/interface/Wrapper.h"
 #include "DataFormats/Common/interface/AssociationMap.h"
 #include "DataFormats/Common/interface/AssociationVector.h"
+#include "DataFormats/Common/interface/AtomicPtrCache.h"
 #include "DataFormats/Candidate/interface/CandMatchMap.h"
 #include "DataFormats/Candidate/interface/CandMatchMapMany.h"
 #include "DataFormats/Candidate/interface/CandAssociation.h"
diff --git a/DataFormats/Candidate/src/classes_def.xml b/DataFormats/Candidate/src/classes_def.xml
index 743e366a31b3a..707dd454ff758 100644
--- a/DataFormats/Candidate/src/classes_def.xml
+++ b/DataFormats/Candidate/src/classes_def.xml
@@ -117,7 +117,7 @@
   </class>
 
   <class name="reco::CandidateRef" />
-  <class name="reco::CandidatePtr" />
+  <class name="reco::CandidatePtr" /> 
   <class name="reco::CandidateRefVector" />
   <class name="reco::CompositeCandidateRef" />
   <class name="reco::CompositeCandidateRefVector" />
@@ -133,6 +133,7 @@
 
   <class name="std::vector<edm::RefToBase<reco::Candidate> >" />
   <class name="std::vector<edm::Ptr<reco::Candidate> >" />
+  <class name="edm::AtomicPtrCache<std::vector<edm::Ptr<reco::Candidate> > >"/>
   <class name="std::vector<edm::PtrVector<reco::Candidate> >" />
   <class name="edm::reftobase::BaseVectorHolder<reco::Candidate>" />
   <class name="edm::reftobase::BaseVectorHolder<reco::Candidate>::const_iterator_imp" />
diff --git a/DataFormats/ParticleFlowCandidate/src/classes.h b/DataFormats/ParticleFlowCandidate/src/classes.h
index fc9aaf38a6b67..59914bb297b91 100644
--- a/DataFormats/ParticleFlowCandidate/src/classes.h
+++ b/DataFormats/ParticleFlowCandidate/src/classes.h
@@ -21,6 +21,7 @@
 #include "DataFormats/Common/interface/Wrapper.h"
 #include "DataFormats/Common/interface/ValueMap.h"
 #include "DataFormats/Common/interface/Association.h"
+#include "DataFormats/Common/interface/AtomicPtrCache.h"
 
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
diff --git a/DataFormats/ParticleFlowCandidate/src/classes_def.xml b/DataFormats/ParticleFlowCandidate/src/classes_def.xml
index 17fa11e0ed1ee..999527435c20b 100644
--- a/DataFormats/ParticleFlowCandidate/src/classes_def.xml
+++ b/DataFormats/ParticleFlowCandidate/src/classes_def.xml
@@ -38,6 +38,7 @@
   <class name="edm::reftobase::Holder<reco::Candidate, reco::PFCandidateRef>"/>
   <class name="edm::reftobase::RefHolder<reco::PFCandidateRef>"/>
   <class name="reco::PFCandidatePtr"/>
+  <class name="edm::AtomicPtrCache<reco::PFCandidatePtr>"/>
   <class name="std::vector<reco::PFCandidatePtr>"/>
   <class name="edm::Wrapper<edm::ValueMap<edm::Ref<std::vector<reco::PFCandidate>,reco::PFCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::PFCandidate>,reco::PFCandidate> > > >"/>
   <class name="edm::ValueMap<edm::Ref<std::vector<reco::PFCandidate>,reco::PFCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::PFCandidate>,reco::PFCandidate> > >"/>
diff --git a/DataFormats/TauReco/src/classes_2.h b/DataFormats/TauReco/src/classes_2.h
index 7e29723f38b3e..de9d780ae83b1 100644
--- a/DataFormats/TauReco/src/classes_2.h
+++ b/DataFormats/TauReco/src/classes_2.h
@@ -19,6 +19,7 @@
 #include "DataFormats/TauReco/interface/HLTTau.h"
 #include "DataFormats/Common/interface/FwdPtr.h"
 #include "DataFormats/Common/interface/RefToPtr.h"
+#include "DataFormats/Common/interface/AtomicPtrCache.h"
 #include "DataFormats/TauReco/interface/PFRecoTauChargedHadron.h"
 #include "DataFormats/TauReco/interface/PFRecoTauChargedHadronFwd.h"
 #include "DataFormats/TauReco/interface/PFJetChargedHadronAssociation.h"
diff --git a/DataFormats/TauReco/src/classes_def_2.xml b/DataFormats/TauReco/src/classes_def_2.xml
index a900718fa2f3c..1e5ca39918ec8 100644
--- a/DataFormats/TauReco/src/classes_def_2.xml
+++ b/DataFormats/TauReco/src/classes_def_2.xml
@@ -374,6 +374,7 @@ isolationTauChargedHadronCandidates_.reset();
    <version ClassVersion="10" checksum="465425628"/>
   </class>
   <class name="std::vector<reco::RecoTauPiZero>"/>
+  <class name="edm::AtomicPtrCache<std::vector<reco::RecoTauPiZero> >"/>
      <class name="std::vector<std::vector<reco::RecoTauPiZero> >"/>
   <class name="edm::Wrapper<std::vector<reco::RecoTauPiZero> >"/>
   <class name="edm::Ref<std::vector<reco::RecoTauPiZero>,reco::RecoTauPiZero,edm::refhelper::FindUsingAdvance<std::vector<reco::RecoTauPiZero>,reco::RecoTauPiZero> >"/>
@@ -390,6 +391,7 @@ isolationTauChargedHadronCandidates_.reset();
    <version ClassVersion="10" checksum="4027987990"/>
   </class>
   <class name="std::vector<reco::PFRecoTauChargedHadron>"/>
+  <class name="edm::AtomicPtrCache<std::vector<reco::PFRecoTauChargedHadron> >"/>
      <class name="std::vector<std::vector<reco::PFRecoTauChargedHadron> >"/>
   <class name="edm::Wrapper<std::vector<reco::PFRecoTauChargedHadron> >"/>
   <class name="edm::Ref<std::vector<reco::PFRecoTauChargedHadron>,reco::PFRecoTauChargedHadron,edm::refhelper::FindUsingAdvance<std::vector<reco::PFRecoTauChargedHadron>,reco::PFRecoTauChargedHadron> >"/>