Fix for cache cleaning with FileSystem engine (directories where renamed, but not actually removed)