* Revert "Remove unused code" This reverts commit bcfba0c050. * Re-add the changes to remove cachedir as a parameter
bcfba0c050