make modifications for afincrementalstore cache problems.