Now works with CakePHP 2.2 (possibly higher too)