Remove category caching (revert me?)