Fix/cache deletions

[jamiemonksuk]

Updating cache deletion to look for files in both old and new cache path structures