I did a quick review, I may have missed or misunderstood things since I don't know the code architecture well, but with a "fresh eye" look the main logic sounds sane, and I added two performance-related inline comments (not sure how important they are).