manual sweep/copy of SystematicsCache from master

I added this in master a long time ago, but forgot sweeping it over.

As a direct copy/sweep of code that is already in master please limit the review to critical points.