Reverting cache changes until isPeriodicCommit() is removed in master