[WIP] Removing Cake dependency injection

in favor of simple argument-based dependency injection
@arschles Use apply.