#349 Moved where the REST call tracking and caching gets used, fixed some issues. Still need to get concept graph sorted out, but I am closer having done this.