Fix to use caf thread header