New injection method, non-caching (bug)
Cleanup