Re-fix damn caching!