Adding the changes for unified makefiles as well as seperable cache calculations