rip out all caching to allow for new solution