[TillE]

You're not going to significantly rewrite a caching system in a matter of days, not if you want to fix more problems than you cause.