Updates to use dedicated cache directory