Improve cache handling in "build" command; update draft