added infrastructure for caching environments