refactoring to simplify the data structures to fix a serious memory
bug: the cache uses waaaay the heck too much.