simplify cached env generation, split cached env into setup and env, update builder to use original env script instead of cached variant