[noticket] *actually* fix the datacache issue