Use exportable id() method

+++ b/lib/Drupal/ctools/DatabaseExportableController.phpundefined
@@ -211,23 +211,23 @@ class DatabaseExportableController extends ExportableControllerBase {
-        if (!empty($this->cache[$object->{$this->info['key']}])) {
-//          $this->cache[$object->{$this->info['key']}]->{$this->info['export type string']} = t('Overridden');
-          $this->cache[$object->{$this->info['key']}]->setIsInCode(TRUE);
-          $this->cache[$object->{$this->info['key']}]->setExportModule($object->getExportModule());
+        if (!empty($this->cache[$object->id()])) {
+//          $this->cache[$object->id()]->{$this->info['export type string']} = t('Overridden');
+          $this->cache[$object->id()]->setIsInCode(TRUE);

It is marked as being in code, but not really in the database is that intended? Previously it seemed to be overridden
shouldn't it be now?

The rest looks fine and is a real great improvement in terms of readability of the code.

The converting to id() itself looks perfect, lets do the mentioned problem in another issue.