Merge "Fix synchronization issue w/ closing CachedCursor"