Revert "fixes build dir and minor fixes"

This reverts commit 2379c6f720c3097ad473cd15f1540d4d8142af06.
fixes cache restore location and minor updates