UPD: small core cache fixes