1 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index 81845f5cf..efda545c5 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -99,6 +99,11 @@ class Puppet::Configurer
         end
 
         unless result
+            if ! Puppet[:usecacheonfailure]
+                Puppet.warning "Not using cache on failed catalog"
+                return nil
+            end
+
             begin
                 duration = thinmark do
                     result = catalog_class.find(name, fact_options.merge(:ignore_terminus => true))