too much cut-and-paste here - only one line different between this and makeDefaultCache above?