Added env support also tags are cached in their own folders