CFI API changed for upcoming buffer.