Cache restructure