Upgrade to envinject-lib 1.17