Clean up key handling, doing type/link tags in objRefs and removing string-built cachekey