Remove the PicoContainer dependency from the ContainerAdapters, i.e. remove the container member and its getter/setter and modify getInstance and verify with a PicoContainer parameter, that will be used to resolve eventual depenencies. This change will also have impact on the Parameter interface, that will have now the methods isResolvable and resolve. http://cvs.picocontainer.codehaus.org/viewrep/~br=MX_PROPOSAL/picocontainer/java/picocontainer/src/java/org/picocontainer/ComponentAdapter.java?r=1.15.2.4 http://cvs.picocontainer.codehaus.org/viewrep/~br=MX_PROPOSAL/picocontainer/java/picocontainer/src/java/org/picocontainer/Parameter.java?r=1.15.2.3 This is done in the current MX_BRANCH and means merging back into HEAD anything related to this change.