Track our caf things

This way we'll update when we know it's stable