some fixes to annotation creation and removal of caching