Don't pass entire env to cache adapter
Merge branch 'master' into non-template-processors

Conflicts:
	lib/sprockets/cache_wrapper.rb