continued work on relation key handling, removed CacheService