My work-in-progress at fixing multiple validation errors when using the compiler cache

Only one failing test remaining... But I can't figure out the best way to handle it :/