> // TODO move those from AGMemoryStorage.h to AGStore.h ?

yes, I'd agree - perhaps on a different JIRA ?