Fix incorrect package name/import lines for LRU cache.
Fix null table-id when adding relations.