adapted structure cache genereation
fixed tests