[3.0] Update Caca in contribs

Update to not depend on cucul directly and update contrib patches.

(cherry picked from commit 2ab65c0a and related