Fix using the proper field form_id, not cache_form_id