Flushing admin menu cache causes some items to get moved incorrectly

I installed admin_menu, then moved Create Content to the admin menu under Content Management (since admin menu no longer does that automatically - ugh). All was correct after I saved the menu. In order to get the admin menu to display the changes, I flushed the cache. That caused Create Content to get moved out from under Content Management. It also moved some of the Template links out from under their respective content types, so the Content Types menu has the types listed followed by a bunch of Template links. This is really FUBAR, hence the critical priority.