refactoring, moved cache from config into the bundle
rebased