Inject into the classpath property

Improves consistency.