prefer injection composition
Merge branch 'redis' into redis-testing