update location of generated files, fix cache generation