Experimental: Don't invoke cwd() so often