1 files changed, 8 insertions, 14 deletions
diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb
index 05464f8c9..c70259304 100644
--- a/lib/puppet/indirector/indirection.rb
+++ b/lib/puppet/indirector/indirection.rb
@@ -1,20 +1,17 @@
 require 'puppet/util/docs'
 require 'puppet/indirector/envelope'
 require 'puppet/indirector/request'
+require 'puppet/util/cacher'
 
 # The class that connects functional classes with their different collection
 # back-ends.  Each indirection has a set of associated terminus classes,
 # each of which is a subclass of Puppet::Indirector::Terminus.
 class Puppet::Indirector::Indirection
+    include Puppet::Util::Cacher
     include Puppet::Util::Docs
 
     @@indirections = []
 
-    # Clear all cached termini from all indirections.
-    def self.clear_cache
-        @@indirections.each { |ind| ind.clear_cache }
-    end
-
     # Find an indirection by name.  This is provided so that Terminus classes
     # can specifically hook up with the indirections they are associated with.
     def self.instance(name)
@@ -54,13 +51,6 @@ class Puppet::Indirector::Indirection
         @cache_class = class_name
     end
 
-    # Clear our cached list of termini, and reset the cache name
-    # so it's looked up again.
-    # This is only used for testing.
-    def clear_cache
-        @termini.clear
-    end
-
     # This is only used for testing.
     def delete
         @@indirections.delete(self) if @@indirections.include?(self)
@@ -104,7 +94,6 @@ class Puppet::Indirector::Indirection
         @model = model
         @name = name
 
-        @termini = {}
         @cache_class = nil
         @terminus_class = nil
 
@@ -138,7 +127,7 @@ class Puppet::Indirector::Indirection
             raise Puppet::DevError, "No terminus specified for %s; cannot redirect" % self.name
         end
         
-        return @termini[terminus_name] ||= make_terminus(terminus_name)
+        return termini[terminus_name] ||= make_terminus(terminus_name)
     end
 
     # This can be used to select the terminus class.
@@ -299,4 +288,9 @@ class Puppet::Indirector::Indirection
         end
         return klass.new
     end
+
+    # Use cached termini.
+    def termini
+        attr_cache(:termini) { Hash.new }
+    end
 end