Adopt newer cake3