Fix for JRuby lazy creation.

By mistake, commit b68e61dc35ddd84a933926c14c760cfe6e472af5 made
JRuby container creation to be non-lazy.

This fixes it, and simplifies it by introducing a
lazy provider that also cleans up.