Another cache fix.

Cache system seems to behave admirably now! :dancer: