Adding non-cached base builds; only use cached-base in dev