[noticket] Fixes to imports for data_cache model