solidifying cache model + bug fixes