Cache busted filenames

Sorry I took longer than I thought to get back with this, I had to wait until today to work on it.

This should resolve issue #26 to my satisfaction, but leaves open the other two problems we discussed.