Merge pull request #278 from wagnert/master

Performance optimizations by refactoring DI provider + switch to new per...