diff --git a/src/container.ts b/src/container.ts
index 9cb7d64..1c40614 100644
--- a/src/container.ts
+++ b/src/container.ts
@@ -12,11 +12,11 @@ import {
   type Provider,
   isAsyncFactoryProvider,
 } from "./providers.js";
-import { isInjectable } from "./decorators.js";
+import { getInjectableTarget, isInjectable } from './decorators.js';
 
 export class Container {
-  private providers = new ProviderMap();
-  private singletons = new SingletonMap();
+  private providers: ProviderMap = new Map();
+  private singletons: SingletonMap = new Map();
 
   bind<T>(provider: Provider<T>): this {
     const token = isConstructorProvider(provider) ? provider : provider.provide;
@@ -96,7 +96,7 @@ export class Container {
       if (isClassToken(token) && isInjectable(token)) {
         this.bind({
           provide: token,
-          useClass: token,
+          useClass: getInjectableTarget(token),
         });
 
         // inheritance support: also bind for its super classes
@@ -206,24 +206,14 @@ function doConstruct<T>(
   }
 }
 
-class ProviderMap extends Map<Token<unknown>, Provider<unknown>> {
-  override get<T>(key: Token<T>): Provider<T> | undefined {
-    return super.get(key) as Provider<T> | undefined;
-  }
-
-  override set<T>(key: Token<T>, value: Provider<T>): this {
-    return super.set(key, value);
-  }
+interface ProviderMap extends Map<Token<unknown>, Provider<unknown>> {
+  get<T>(key: Token<T>): Provider<T> | undefined
+  set<T>(key: Token<T>, value: Provider<T>): this
 }
 
-class SingletonMap extends Map<Token<unknown>, unknown> {
-  override get<T>(token: Token<T>): T | undefined {
-    return super.get(token) as T | undefined;
-  }
-
-  override set<T>(token: Token<T>, value: T): this {
-    return super.set(token, value);
-  }
+interface SingletonMap extends Map<Token<unknown>, unknown> {
+  get<T>(token: Token<T>): T | undefined
+  set<T>(token: Token<T>, value: T): this
 }
 
 export function bootstrap<T>(token: Token<T>): T {
diff --git a/src/decorators.ts b/src/decorators.ts
index 2c00a37..dca7fbd 100644
--- a/src/decorators.ts
+++ b/src/decorators.ts
@@ -6,14 +6,30 @@ type ClassDecorator<C extends Class<unknown>> = (target: C) => C | void;
 export const injectableSymbol = Symbol("injectable");
 
 export function injectable<C extends Class<unknown>>(): ClassDecorator<C> {
-  return (target) =>
+  return (target) => {
+    let superClass = Object.getPrototypeOf(target);
+    while (superClass.name) {
+      Object.defineProperty(superClass, injectableSymbol, {
+        get: () => target,
+      });
+      superClass = Object.getPrototypeOf(superClass);
+    }
+
     Object.defineProperty(target, injectableSymbol, {
-      value: true,
-      writable: false,
+      get: () => target,
     });
+  };
 }
 
-export function isInjectable<T>(target: Class<T>) {
+export function isInjectable<T>(target: Class<T>): target is Class<T> & { [injectableSymbol]: Class<unknown> } {
   // eslint-disable-next-line no-prototype-builtins
   return target.hasOwnProperty(injectableSymbol);
 }
+
+export function getInjectableTarget<T>(target: Class<T>): Class<unknown> {
+  if (!isInjectable(target)) {
+    throw Error(`Target ${target} nor any of its subclasses is not annotated with @injectable`)
+  }
+
+  return target[injectableSymbol];
+}
diff --git a/src/providers.test.ts b/src/providers.test.ts
index e93224d..197bbf5 100644
--- a/src/providers.test.ts
+++ b/src/providers.test.ts
@@ -194,6 +194,7 @@ describe("Providers", () => {
 
       const container = new Container();
 
+      expect(container.get(AbstractService)).toBeInstanceOf(FooService);
       expect(container.get(FooService)).toBeInstanceOf(FooService);
       expect(container.get(FooService)).toBeInstanceOf(AbstractService);
 
diff --git a/src/tokens.ts b/src/tokens.ts
index 94180f2..1e81527 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -20,7 +20,7 @@ interface AsyncInjectionTokenOptions<T> {
 export class InjectionToken<T> {
   constructor(
     private description: string | symbol,
-    public options?: InjectionTokenOptions<NoInfer<T>> | AsyncInjectionTokenOptions<NoInfer<T>>,
+    public options?: InjectionTokenOptions<T> | AsyncInjectionTokenOptions<T>,
   ) {}
 
   public toString(): string {