Some API clean-ups, objectory cache reworking, some documentation changes