Feature/clean up

Pull req for caching issue in db class