Fixed naming and caching of gear env