lib/puppet/indirector/indirection.rb in puppet-3.1.0 vs lib/puppet/indirector/indirection.rb in puppet-3.1.1

@@ -190,11 +190,11 @@
     # Otherwise, return the result from the terminus, caching if appropriate.
     if ! request.ignore_terminus? and result = terminus.find(request)
       result.expiration ||= self.expiration if result.respond_to?(:expiration)
       if cache? and request.use_cache?
         Puppet.info "Caching #{self.name} for #{request.key}"
-        cache.save request(:save, nil, result, options)
+        cache.save request(:save, key, result, options)
       end
 
       return terminus.respond_to?(:filter) ? terminus.filter(result) : result
     end
 
@@ -301,9 +301,10 @@
       terminus_name = terminus_class
     end
 
     dest_terminus = terminus(terminus_name)
     check_authorization(request, dest_terminus)
+    dest_terminus.validate(request)
 
     dest_terminus
   end
 
   # Create a new terminus instance.