WIP refactor builds to use cache package