Moving env var statments outside the caching blocks