Cleaner approach to caching
I have observed the ability of things to move from place to place and reflect the fact of it in the graphical interface.

I don't really feel like sorting out the other particulars of the changes I've made, live with it.