lots of cleanup. separated caching out of the db module, then commented it out...