Improve wrapping of DataValueGenerator and support OSGi i.e. class loaders unloading.