I was definitely seeing your other changes (e.g. all the other issues I'd listed in #2068 were fixed), so I don't think it was caching.  In any event, after syncing to your latest changes these cases all show up in the order I was hoping for... so somehow or another, it's working for me now!