diff --git a/lib/puppet/environments.rb b/lib/puppet/environments.rb
index 6af5622de..39479cbfe 100644
--- a/lib/puppet/environments.rb
+++ b/lib/puppet/environments.rb
@@ -1,415 +1,407 @@
 # @api private
 module Puppet::Environments
 
   class EnvironmentNotFound < Puppet::Error
     def initialize(environment_name, original = nil)
       environmentpath = Puppet[:environmentpath]
       super("Could not find a directory environment named '#{environment_name}' anywhere in the path: #{environmentpath}. Does the directory exist?", original)
     end
   end
 
   # @api private
   module EnvironmentCreator
     # Create an anonymous environment.
     #
     # @param module_path [String] A list of module directories separated by the
     #   PATH_SEPARATOR
     # @param manifest [String] The path to the manifest
     # @return A new environment with the `name` `:anonymous`
     #
     # @api private
     def for(module_path, manifest)
       Puppet::Node::Environment.create(:anonymous,
                                        module_path.split(File::PATH_SEPARATOR),
                                        manifest)
     end
   end
 
   # @!macro [new] loader_search_paths
   #   A list of indicators of where the loader is getting its environments from.
   #   @return [Array<String>] The URIs of the load locations
   #
   # @!macro [new] loader_list
   #   @return [Array<Puppet::Node::Environment>] All of the environments known
   #     to the loader
   #
   # @!macro [new] loader_get
   #   Find a named environment
   #
   #   @param name [String,Symbol] The name of environment to find
   #   @return [Puppet::Node::Environment, nil] the requested environment or nil
   #     if it wasn't found
   #
   # @!macro [new] loader_get_conf
   #   Attempt to obtain the initial configuration for the environment.  Not all
   #   loaders can provide this.
   #
   #   @param name [String,Symbol] The name of the environment whose configuration
   #     we are looking up
   #   @return [Puppet::Setting::EnvironmentConf, nil] the configuration for the
   #     requested environment, or nil if not found or no configuration is available
   #
   # @!macro [new] loader_get_or_fail
   #   Find a named environment or raise
   #   Puppet::Environments::EnvironmentNotFound when the named environment is
   #   does not exist.
   #
   #   @param name [String,Symbol] The name of environment to find
   #   @return [Puppet::Node::Environment] the requested environment
 
   # A source of pre-defined environments.
   #
   # @api private
   class Static
     include EnvironmentCreator
 
     def initialize(*environments)
       @environments = environments
     end
 
     # @!macro loader_search_paths
     def search_paths
       ["data:text/plain,internal"]
     end
 
     # @!macro loader_list
     def list
       @environments
     end
 
     # @!macro loader_get
     def get(name)
       @environments.find do |env|
         env.name == name.intern
       end
     end
 
     # @!macro loader_get_or_fail
     def get!(name)
       if !environment = get(name)
         raise EnvironmentNotFound, name
       end
       environment
     end
 
     # Returns a basic environment configuration object tied to the environment's
     # implementation values.  Will not interpolate.
     #
     # @!macro loader_get_conf
     def get_conf(name)
       env = get(name)
       if env
         Puppet::Settings::EnvironmentConf.static_for(env)
       else
         nil
       end
     end
   end
 
   # A source of unlisted pre-defined environments.
   #
   # Used only for internal bootstrapping environments which are not relevant
   # to an end user (such as the fall back 'configured' environment).
   #
   # @api private
   class StaticPrivate < Static
 
     # Unlisted
     #
     # @!macro loader_list
     def list
       []
     end
   end
 
   # Old-style environments that come either from explicit stanzas in
   # puppet.conf or from dynamic environments created from use of `$environment`
   # in puppet.conf.
   #
   # @example Explicit Stanza
   #   [environment_name]
   #   modulepath=/var/my_env/modules
   #
   # @example Dynamic Environments
   #   [master]
   #   modulepath=/var/$environment/modules
   #
   # @api private
   class Legacy
     include EnvironmentCreator
 
     # @!macro loader_search_paths
     def search_paths
       ["file://#{Puppet[:config]}"]
     end
 
     # @note The list of environments for the Legacy environments is always
     #   empty.
     #
     # @!macro loader_list
     def list
       []
     end
 
     # @note Because the Legacy system cannot list out all of its environments,
     #   get is able to return environments that are not returned by a call to
     #   {#list}.
     #
     # @!macro loader_get
     def get(name)
       Puppet::Node::Environment.new(name)
     end
 
     # @note Because the Legacy system cannot list out all of its environments,
     #   this method will never fail and is only calling get directly.
     #
     # @!macro loader_get_or_fail
     def get!(name)
       get(name)
     end
 
     # @note we could return something here, but since legacy environments
     #   are deprecated, there is no point.
     #
     # @!macro loader_get_conf
     def get_conf(name)
       nil
     end
   end
 
   # Reads environments from a directory on disk. Each environment is
   # represented as a sub-directory. The environment's manifest setting is the
   # `manifest` directory of the environment directory. The environment's
   # modulepath setting is the global modulepath (from the `[master]` section
   # for the master) prepended with the `modules` directory of the environment
   # directory.
   #
   # @api private
   class Directories
     def initialize(environment_dir, global_module_path)
       @environment_dir = environment_dir
       @global_module_path = global_module_path
     end
 
     # Generate an array of directory loaders from a path string.
     # @param path [String] path to environment directories
     # @param global_module_path [Array<String>] the global modulepath setting
     # @return [Array<Puppet::Environments::Directories>] An array
     #   of configured directory loaders.
     def self.from_path(path, global_module_path)
       environments = path.split(File::PATH_SEPARATOR)
       environments.map do |dir|
         Puppet::Environments::Directories.new(dir, global_module_path)
       end
     end
 
     # @!macro loader_search_paths
     def search_paths
       ["file://#{@environment_dir}"]
     end
 
     # @!macro loader_list
     def list
       valid_directories.collect do |envdir|
         name = Puppet::FileSystem.basename_string(envdir)
 
         setting_values = Puppet.settings.values(name, Puppet.settings.preferred_run_mode)
         env = Puppet::Node::Environment.create(
           name.intern,
           Puppet::Node::Environment.split_path(setting_values.interpolate(:modulepath)),
           setting_values.interpolate(:manifest),
           setting_values.interpolate(:config_version)
         )
         env.watching = false
         env
       end
     end
 
     # @!macro loader_get
     def get(name)
       list.find { |env| env.name == name.intern }
     end
 
     # @!macro loader_get_or_fail
     def get!(name)
       if !environment = get(name)
         raise EnvironmentNotFound, name
       end
       environment
     end
 
     # @!macro loader_get_conf
     def get_conf(name)
       valid_directories.each do |envdir|
         envname = Puppet::FileSystem.basename_string(envdir)
         if envname == name.to_s
           return Puppet::Settings::EnvironmentConf.load_from(envdir, @global_module_path)
         end
       end
       nil
     end
 
     private
 
     def valid_directories
       if Puppet::FileSystem.directory?(@environment_dir)
         Puppet::FileSystem.children(@environment_dir).select do |child|
           name = Puppet::FileSystem.basename_string(child)
           Puppet::FileSystem.directory?(child) &&
              Puppet::Node::Environment.valid_name?(name)
         end
       else
         []
       end
     end
   end
 
   # Combine together multiple loaders to act as one.
   # @api private
   class Combined
     def initialize(*loaders)
       @loaders = loaders
     end
 
     # @!macro loader_search_paths
     def search_paths
       @loaders.collect(&:search_paths).flatten
     end
 
     # @!macro loader_list
     def list
       @loaders.collect(&:list).flatten
     end
 
     # @!macro loader_get
     def get(name)
       @loaders.each do |loader|
         if env = loader.get(name)
           return env
         end
       end
       nil
     end
 
     # @!macro loader_get_or_fail
     def get!(name)
       if !environment = get(name)
         raise EnvironmentNotFound, name
       end
       environment
     end
 
     # @!macro loader_get_conf
     def get_conf(name)
       @loaders.each do |loader|
         if conf = loader.get_conf(name)
           return conf
         end
       end
       nil
     end
 
   end
 
   class Cached < Combined
     INFINITY = 1.0 / 0.0
 
     def initialize(*loaders)
       super
       @cache = {}
     end
 
     def get(name)
       evict_if_expired(name)
       if result = @cache[name]
         return result.value
       elsif (result = super(name))
         @cache[name] = entry(result)
         result
       end
     end
 
-    # @!macro loader_get_or_fail
-    def get!(name)
-      if !environment = get(name)
-        raise EnvironmentNotFound, name
-      end
-      environment
-    end
-
     # Clears the cache of the environment with the given name.
     # (The intention is that this could be used from a MANUAL cache eviction command (TBD)
     def clear(name)
       @cache.delete(name)
     end
 
     # Clears all cached environments.
     # (The intention is that this could be used from a MANUAL cache eviction command (TBD)
     def clear_all()
       @cache = {}
     end
 
     # This implementation evicts the cache, and always gets the current configuration of the environment
     # TODO: While this is wasteful since it needs to go on a search for the conf, it is too disruptive to optimize
     # this.
     #
     def get_conf(name)
       evict_if_expired(name)
       super name
     end
 
     # Creates a suitable cache entry given the time to live for one environment
     #
     def entry(env)
       ttl = (conf = get_conf(env.name)) ? conf.environment_timeout : Puppet.settings.value(:environment_timeout)
       case ttl
       when 0
         NotCachedEntry.new(env)     # Entry that is always expired (avoids syscall to get time)
       when INFINITY
         Entry.new(env)              # Entry that never expires (avoids syscall to get time)
       else
         TTLEntry.new(env, ttl)
       end
     end
 
     # Evicts the entry if it has expired
     #
     def evict_if_expired(name)
       if (result = @cache[name]) && result.expired?
         @cache.delete(name)
       end
     end
 
     # Never evicting entry
     class Entry
       attr_reader :value
 
       def initialize(value)
         @value = value
       end
 
       def expired?
         false
       end
     end
 
     # Always evicting entry
     class NotCachedEntry < Entry
       def expired?
         true
       end
     end
 
     # Time to Live eviction policy entry
     class TTLEntry < Entry
       def initialize(value, ttl_seconds)
         super value
         @ttl = Time.now + ttl_seconds
       end
 
       def expired?
         Time.now > @ttl
       end
     end
   end
 end
diff --git a/spec/unit/environments_spec.rb b/spec/unit/environments_spec.rb
index 917790f29..da66ab0c9 100644
--- a/spec/unit/environments_spec.rb
+++ b/spec/unit/environments_spec.rb
@@ -1,400 +1,422 @@
 require 'spec_helper'
 require 'puppet/environments'
 require 'puppet/file_system'
 require 'matchers/include'
 
 module PuppetEnvironments
 describe Puppet::Environments do
   include Matchers::Include
 
   FS = Puppet::FileSystem
 
   describe "directories loader" do
     before(:each) do
       Puppet.settings.initialize_global_settings
     end
 
     it "lists environments" do
       global_path_1_location = File.expand_path("global_path_1")
       global_path_2_location = File.expand_path("global_path_2")
       global_path_1 = FS::MemoryFile.a_directory(global_path_1_location)
       global_path_2 = FS::MemoryFile.a_directory(global_path_2_location)
 
       envdir = FS::MemoryFile.a_directory(File.expand_path("envdir"), [
         FS::MemoryFile.a_directory("env1", [
           FS::MemoryFile.a_missing_file("environment.conf"),
           FS::MemoryFile.a_directory("modules"),
           FS::MemoryFile.a_directory("manifests"),
         ]),
         FS::MemoryFile.a_directory("env2", [
           FS::MemoryFile.a_missing_file("environment.conf"),
         ]),
       ])
 
       loader_from(:filesystem => [envdir, global_path_1, global_path_2],
                   :directory => envdir,
                   :modulepath => [global_path_1_location, global_path_2_location]) do |loader|
         expect(loader.list).to include_in_any_order(
           environment(:env1).
             with_manifest("#{FS.path_string(envdir)}/env1/manifests").
             with_modulepath(["#{FS.path_string(envdir)}/env1/modules",
                              global_path_1_location,
                              global_path_2_location]),
           environment(:env2))
       end
     end
 
     it "does not list files" do
       envdir = FS::MemoryFile.a_directory(File.expand_path("envdir"), [
         FS::MemoryFile.a_regular_file_containing("foo", ''),
         FS::MemoryFile.a_directory("env1", [
           FS::MemoryFile.a_missing_file("environment.conf"),
         ]),
         FS::MemoryFile.a_directory("env2", [
           FS::MemoryFile.a_missing_file("environment.conf"),
         ]),
       ])
 
       loader_from(:filesystem => [envdir],
                   :directory => envdir) do |loader|
         expect(loader.list).to include_in_any_order(environment(:env1), environment(:env2))
       end
     end
 
     it "ignores directories that are not valid env names (alphanumeric and _)" do
       envdir = FS::MemoryFile.a_directory(File.expand_path("envdir"), [
         FS::MemoryFile.a_directory(".foo"),
         FS::MemoryFile.a_directory("bar-thing"),
         FS::MemoryFile.a_directory("with spaces"),
         FS::MemoryFile.a_directory("some.thing"),
         FS::MemoryFile.a_directory("env1", [
           FS::MemoryFile.a_missing_file("environment.conf"),
         ]),
         FS::MemoryFile.a_directory("env2", [
           FS::MemoryFile.a_missing_file("environment.conf"),
         ]),
       ])
 
       loader_from(:filesystem => [envdir],
                   :directory => envdir) do |loader|
         expect(loader.list).to include_in_any_order(environment(:env1), environment(:env2))
       end
     end
 
     it "gets a particular environment" do
       directory_tree = FS::MemoryFile.a_directory(File.expand_path("envdir"), [
         FS::MemoryFile.a_directory("env1", [
           FS::MemoryFile.a_missing_file("environment.conf"),
         ]),
         FS::MemoryFile.a_directory("env2", [
           FS::MemoryFile.a_missing_file("environment.conf"),
         ]),
       ])
 
       loader_from(:filesystem => [directory_tree],
                   :directory => directory_tree) do |loader|
         expect(loader.get("env1")).to environment(:env1)
       end
     end
 
     it "returns nil if an environment can't be found" do
       directory_tree = FS::MemoryFile.a_directory("envdir", [])
 
       loader_from(:filesystem => [directory_tree],
                   :directory => directory_tree) do |loader|
         expect(loader.get("env_not_in_this_list")).to be_nil
       end
     end
 
     it "raises error if an environment can't be found" do
       directory_tree = FS::MemoryFile.a_directory("envdir", [])
 
       loader_from(:filesystem => [directory_tree],
                   :directory => directory_tree) do |loader|
         expect do
           loader.get!("env_not_in_this_list")
         end.to raise_error(Puppet::Environments::EnvironmentNotFound)
       end
     end
 
     context "with an environment.conf" do
       let(:envdir) do
         FS::MemoryFile.a_directory(File.expand_path("envdir"), [
           FS::MemoryFile.a_directory("env1", [
             FS::MemoryFile.a_regular_file_containing("environment.conf", content),
           ]),
         ])
       end
       let(:manifestdir) { FS::MemoryFile.a_directory(File.expand_path("/some/manifest/path")) }
       let(:modulepath) do
         [
           FS::MemoryFile.a_directory(File.expand_path("/some/module/path")),
           FS::MemoryFile.a_directory(File.expand_path("/some/other/path")),
         ]
       end
 
       let(:content) do
         <<-EOF
 manifest=#{manifestdir}
 modulepath=#{modulepath.join(File::PATH_SEPARATOR)}
 config_version=/some/script
         EOF
       end
 
       it "reads environment.conf settings" do
         loader_from(:filesystem => [envdir, manifestdir, modulepath].flatten,
                     :directory => envdir) do |loader|
           expect(loader.get("env1")).to environment(:env1).
             with_manifest(manifestdir.path).
             with_modulepath(modulepath.map(&:path))
         end
       end
 
       it "does not append global_module_path to environment.conf modulepath setting" do
         global_path_location = File.expand_path("global_path")
         global_path = FS::MemoryFile.a_directory(global_path_location)
 
         loader_from(:filesystem => [envdir, manifestdir, modulepath, global_path].flatten,
                     :directory => envdir,
                     :modulepath => [global_path]) do |loader|
           expect(loader.get("env1")).to environment(:env1).
             with_manifest(manifestdir.path).
             with_modulepath(modulepath.map(&:path))
         end
       end
 
       it "reads config_version setting" do
         loader_from(:filesystem => [envdir, manifestdir, modulepath].flatten,
                     :directory => envdir) do |loader|
           expect(loader.get("env1")).to environment(:env1).
             with_manifest(manifestdir.path).
             with_modulepath(modulepath.map(&:path)).
             with_config_version(File.expand_path('/some/script'))
         end
       end
 
       it "accepts an empty environment.conf without warning" do
         content = nil
 
         envdir = FS::MemoryFile.a_directory(File.expand_path("envdir"), [
           FS::MemoryFile.a_directory("env1", [
             FS::MemoryFile.a_regular_file_containing("environment.conf", content),
           ]),
         ])
 
         manifestdir = FS::MemoryFile.a_directory(File.join(envdir, "env1", "manifests"))
         modulesdir = FS::MemoryFile.a_directory(File.join(envdir, "env1", "modules"))
         global_path_location = File.expand_path("global_path")
         global_path = FS::MemoryFile.a_directory(global_path_location)
 
         loader_from(:filesystem => [envdir, manifestdir, modulesdir, global_path].flatten,
                     :directory => envdir,
                     :modulepath => [global_path]) do |loader|
           expect(loader.get("env1")).to environment(:env1).
             with_manifest("#{FS.path_string(envdir)}/env1/manifests").
             with_modulepath(["#{FS.path_string(envdir)}/env1/modules", global_path_location]).
             with_config_version(nil)
         end
 
         expect(@logs).to be_empty
       end
 
       it "logs a warning, but processes the main settings if there are extraneous sections" do
         content << "[foo]"
         loader_from(:filesystem => [envdir, manifestdir, modulepath].flatten,
                     :directory => envdir) do |loader|
           expect(loader.get("env1")).to environment(:env1).
             with_manifest(manifestdir.path).
             with_modulepath(modulepath.map(&:path)).
             with_config_version(File.expand_path('/some/script'))
         end
 
         expect(@logs.map(&:to_s).join).to match(/Invalid.*at.*\/env1.*may not have sections.*ignored: 'foo'/)
       end
 
       it "logs a warning, but processes the main settings if there are any extraneous settings" do
         content << "dog=arf\n"
         content << "cat=mew\n"
         content << "[ignored]\n"
         content << "cow=moo\n"
         loader_from(:filesystem => [envdir, manifestdir, modulepath].flatten,
                     :directory => envdir) do |loader|
           expect(loader.get("env1")).to environment(:env1).
             with_manifest(manifestdir.path).
             with_modulepath(modulepath.map(&:path)).
             with_config_version(File.expand_path('/some/script'))
         end
 
         expect(@logs.map(&:to_s).join).to match(/Invalid.*at.*\/env1.*unknown setting.*dog, cat/)
       end
 
       it "interpretes relative paths from the environment's directory" do
         content = <<-EOF
 manifest=relative/manifest
 modulepath=relative/modules
 config_version=relative/script
         EOF
 
         envdir = FS::MemoryFile.a_directory(File.expand_path("envdir"), [
           FS::MemoryFile.a_directory("env1", [
             FS::MemoryFile.a_regular_file_containing("environment.conf", content),
             FS::MemoryFile.a_missing_file("modules"),
             FS::MemoryFile.a_directory('relative', [
               FS::MemoryFile.a_directory('modules'),
             ]),
           ]),
         ])
 
         loader_from(:filesystem => [envdir],
                     :directory => envdir) do |loader|
           expect(loader.get("env1")).to environment(:env1).
             with_manifest(File.join(envdir, 'env1', 'relative', 'manifest')).
             with_modulepath([File.join(envdir, 'env1', 'relative', 'modules')]).
             with_config_version(File.join(envdir, 'env1', 'relative', 'script'))
         end
       end
 
       it "interpolates other setting values correctly" do
         modulepath = [
           File.expand_path('/some/absolute'),
           '$basemodulepath',
           'modules'
         ].join(File::PATH_SEPARATOR)
 
         content = <<-EOF
 manifest=$confdir/whackymanifests
 modulepath=#{modulepath}
 config_version=$vardir/random/scripts
         EOF
 
         some_absolute_dir = FS::MemoryFile.a_directory(File.expand_path('/some/absolute'))
         base_module_dirs = Puppet[:basemodulepath].split(File::PATH_SEPARATOR).map do |path|
           FS::MemoryFile.a_directory(path)
         end
         envdir = FS::MemoryFile.a_directory(File.expand_path("envdir"), [
           FS::MemoryFile.a_directory("env1", [
             FS::MemoryFile.a_regular_file_containing("environment.conf", content),
             FS::MemoryFile.a_directory("modules"),
           ]),
         ])
 
         loader_from(:filesystem => [envdir, some_absolute_dir, base_module_dirs].flatten,
                     :directory => envdir) do |loader|
           expect(loader.get("env1")).to environment(:env1).
             with_manifest(File.join(Puppet[:confdir], 'whackymanifests')).
             with_modulepath([some_absolute_dir.path,
                             base_module_dirs.map { |d| d.path },
                             File.join(envdir, 'env1', 'modules')].flatten).
             with_config_version(File.join(Puppet[:vardir], 'random', 'scripts'))
         end
       end
 
       it "uses environment.conf settings regardless of existence of modules and manifests subdirectories" do
         envdir = FS::MemoryFile.a_directory(File.expand_path("envdir"), [
           FS::MemoryFile.a_directory("env1", [
             FS::MemoryFile.a_regular_file_containing("environment.conf", content),
             FS::MemoryFile.a_directory("modules"),
             FS::MemoryFile.a_directory("manifests"),
           ]),
         ])
 
         loader_from(:filesystem => [envdir, manifestdir, modulepath].flatten,
                     :directory => envdir) do |loader|
           expect(loader.get("env1")).to environment(:env1).
             with_manifest(manifestdir.path).
             with_modulepath(modulepath.map(&:path)).
             with_config_version(File.expand_path('/some/script'))
         end
       end
     end
   end
 
   describe "static loaders" do
     let(:static1) { Puppet::Node::Environment.create(:static1, []) }
     let(:static2) { Puppet::Node::Environment.create(:static2, []) }
     let(:loader) { Puppet::Environments::Static.new(static1, static2) }
 
     it "lists environments" do
       expect(loader.list).to eq([static1, static2])
     end
 
     it "gets an environment" do
       expect(loader.get(:static2)).to eq(static2)
     end
 
     it "returns nil if env not found" do
       expect(loader.get(:doesnotexist)).to be_nil
     end
 
     it "raises error if environment is not found" do
       expect do
         loader.get!(:doesnotexist)
       end.to raise_error(Puppet::Environments::EnvironmentNotFound)
     end
 
     it "gets a basic conf" do
       conf = loader.get_conf(:static1)
       expect(conf.modulepath).to eq('')
       expect(conf.manifest).to eq(:no_manifest)
       expect(conf.config_version).to be_nil
     end
 
     it "returns nil if you request a configuration from an env that doesn't exist" do
       expect(loader.get_conf(:doesnotexist)).to be_nil
     end
 
     context "that are private" do
       let(:private_env) { Puppet::Node::Environment.create(:private, []) }
       let(:loader) { Puppet::Environments::StaticPrivate.new(private_env) }
 
       it "lists nothing" do
         expect(loader.list).to eq([])
       end
     end
   end
 
+
+  describe "cached loaders" do
+    let(:cached1) { Puppet::Node::Environment.create(:cached1, []) }
+    let(:cached2) { Puppet::Node::Environment.create(:cached2, []) }
+    let(:static_loader) { Puppet::Environments::Static.new(cached1, cached2) }
+    let(:loader) { Puppet::Environments::Cached.new(static_loader) }
+
+    it "gets an environment" do
+      expect(loader.get(:cached2)).to eq(cached2)
+    end
+
+    it "returns nil if env not found" do
+      expect(loader.get(:doesnotexist)).to be_nil
+    end
+
+    it "raises error if environment is not found" do
+      expect do
+        loader.get!(:doesnotexist)
+      end.to raise_error(Puppet::Environments::EnvironmentNotFound)
+    end
+  end
+
   RSpec::Matchers.define :environment do |name|
     match do |env|
       env.name == name &&
         (!@manifest || @manifest == env.manifest) &&
         (!@modulepath || @modulepath == env.modulepath) &&
         (!@config_version || @config_version == env.config_version)
     end
 
     chain :with_manifest do |manifest|
       @manifest = manifest
     end
 
     chain :with_modulepath do |modulepath|
       @modulepath = modulepath
     end
 
     chain :with_config_version do |config_version|
       @config_version = config_version
     end
 
     description do
       "environment #{expected}" +
         (@manifest ? " with manifest #{@manifest}" : "") +
         (@modulepath ? " with modulepath [#{@modulepath.join(', ')}]" : "") +
         (@config_version ? " with config_version #{@config_version}" : "")
     end
 
     failure_message_for_should do |env|
       "expected <#{env.name}: modulepath = [#{env.modulepath.join(', ')}], manifest = #{env.manifest}, config_version = #{env.config_version}> to be #{description}"
     end
   end
 
   def loader_from(options, &block)
     FS.overlay(*options[:filesystem]) do
       environments = Puppet::Environments::Directories.new(
         options[:directory],
         options[:modulepath] || []
       )
       Puppet.override(:environments => environments) do
         yield environments
       end
     end
   end
 end
 end