Fixing #1247 -- no more clear_cache failures.

I had clearly only run spec/ since this work.

test/lib/puppettest.rb

@@ -302,7 +302,7 @@ module PuppetTest
         Puppet::Util::Storage.clear
         Puppet.clear
         Puppet.settings.clear
-        Puppet::Indirector::Indirection.clear_cache
+        Puppet::Util::Cacher.invalidate
 
         @memoryatend = Puppet::Util.memory
         diff = @memoryatend - @memoryatstart

test/network/handler/master.rb

@@ -10,7 +10,7 @@ class TestMaster < Test::Unit::TestCase
 
     def teardown
         super
-        Puppet::Indirector::Indirection.clear_cache
+        Puppet::Util::Cacher.invalidate
     end
 
     def test_freshness_is_always_now