WIP: Remove more cache clearing upon installation