diff --git a/packages/compat/src/prebuilt-addons.ts b/packages/compat/src/prebuilt-addons.ts
index e006913b1..191e86c8d 100644
--- a/packages/compat/src/prebuilt-addons.ts
+++ b/packages/compat/src/prebuilt-addons.ts
@@ -34,7 +34,7 @@ class RehomedPackageCache extends PackageCache {
   constructor(private appSrcDir: string, private appDestDir: string) {
     super();
   }
-  protected basedir(pkg: Package): string {
+  basedir(pkg: Package): string {
     if (pkg.root === this.appSrcDir) {
       return this.appDestDir;
     }
diff --git a/packages/core/src/package-cache.ts b/packages/core/src/package-cache.ts
index 52cb0ab2e..518643330 100644
--- a/packages/core/src/package-cache.ts
+++ b/packages/core/src/package-cache.ts
@@ -44,7 +44,7 @@ export default class PackageCache {
   protected rootCache: Map<string, Package> = new Map();
   protected resolutionCache: Map<Package, Map<string, Package | null>> = new Map();
 
-  protected basedir(pkg: Package): string {
+  basedir(pkg: Package): string {
     return pkg.root;
   }
 
diff --git a/packages/core/src/package.ts b/packages/core/src/package.ts
index 3e37efa6f..13e907df5 100644
--- a/packages/core/src/package.ts
+++ b/packages/core/src/package.ts
@@ -140,7 +140,7 @@ export default class Package {
             // stop you.
             let pkg;
             try {
-              pkg = this.packageCache.get(join(this.root, path));
+              pkg = this.packageCache.get(join(this.packageCache.basedir(this), path));
             } catch (err) {
               // package was missing or had invalid package.json
               return false;
@@ -153,7 +153,7 @@ export default class Package {
               main = `${main}.js`;
             }
 
-            let mainPath = join(this.root, path, main);
+            let mainPath = join(this.packageCache.basedir(this), path, main);
             if (!existsSync(mainPath)) {
               // package has no valid main
               return false;
diff --git a/packages/util/addon/ember-private-api.js b/packages/util/addon/ember-private-api.js
index da9c9c6e3..a6cac87ba 100644
--- a/packages/util/addon/ember-private-api.js
+++ b/packages/util/addon/ember-private-api.js
@@ -27,7 +27,7 @@ export function lookupCurriedComponentDefinition(name, owner) {
 }
 
 function contextForLookup(owner) {
-  if (macroCondition(dependencySatisfies('ember-source', '>=3.24.0-canary'))) {
+  if (macroCondition(dependencySatisfies('ember-source', '>=3.24.0-canary || >=3.24.0-beta'))) {
     return owner;
   } else {
     return { owner };