minor refactoring
removed cache calls for now