Fix up cake pattern for CouchSync