Revert "switch away from caf"

This reverts commit 8a4e2a666543f816d3282cc77487226576bf9447.