Make file moving play nicely

Change-Id: I4c4b146cd56224e84c23e9242196964f199e3c75
Support rerendering a cached job

Change-Id: I7b772bd344be2147cf39d285e75a111f381b22ae