Complicates things, I didn't aim to cache everything before merging, I aimed to have cache in 5.1.