fix

simplify cells, fix cached_property