Small changes in cache path handling