Switch to our own audio-caf & display-caf