Access the NoteInfoCache through NoteInfo.
Added missing ids fro the mockup cache.
Small refactoring.