update delete data cache logic for not collapsed data
remove extra space
Avoid having GC to de-reference collapsed object.
Never update the expiration from a collapsed object.
Bumped version to 2.1.0
Merge branch 'support/2.0.x' into support/2.x
Merge tag '2.1.0'