Back out in-flight state caching changes.