Cache and world split up, attack refactoring started