remove returns
Merge branch 'master' of https://github.com/concerto/concerto

* 'master' of https://github.com/concerto/concerto:
  Check for both cache keys, close #715.
  Refactor subscriptions.