Ensure that config/environment cache is properly cleared.
Merge pull request #2031 from rwjblue/ensure-cache-is-properly-cleared

Ensure that config/environment cache is properly cleared.