start refactoring caching/searching