Moving cachable parts further up the file