some more cleanings

also renamed cache_object_t to cached_object_t