Always get adapters through container
Merge pull request #1148 from tchak/adapter-cleanup

Always get adapters through container