noPreserveCache functionality restored

Fixes #35