Fix cache key for non-folderish objects