Reorder cache definitions