Fix DI aProvider <- a & circular dependency issue