service refactoring to accomodate callbacks in every scenario, including cache
Merge branch 'master' of https://github.com/jilse/451order