Update env vars
Add cache completion