Feature/backport cake 2.4 api classes