cleanup
rework to cache the bundle
backup using user.home and user.dir system properties