Fixed some caching issues (blows on every notice insert. No good.)