Change env var names to avoid global naming conflicts
Merge branch 'cache-dir-removal' into test