added tweaks to reuse precomputed data and fixes duplicate job executions