Files sit around in cache directory after being moved

[Floppy]

The cache sweeper will get rid of them, but ideally files should be moved if possible, not copied. This will also speed things up. Need to look into how Shrine handles it, because while there is an "always move" option, I'm not sure how intelligent it is. But it's not high priority now we have the sweeper.