diff --git a/lib/indieauth/endpoints.rb b/lib/indieauth/endpoints.rb
index 3228e16..267c635 100644
--- a/lib/indieauth/endpoints.rb
+++ b/lib/indieauth/endpoints.rb
@@ -1,7 +1,11 @@
 module Indieauth
   class Endpoints
     def initialize(site_url)
-      @endpoints = IndieWeb::Endpoints.get(site_url)
+      @site_url = site_url
+    end
+
+    def endpoints
+      client.endpoints
     end
 
     def method_missing(method)
@@ -10,6 +14,10 @@ module Indieauth
 
     private
 
-    attr_accessor :endpoints
+    def client
+      IndieWeb::Endpoints::Client.new(site_url)
+    end
+
+    attr_accessor :site_url
   end
 end
diff --git a/lib/micropub/webserver.rb b/lib/micropub/webserver.rb
index d5cb34c..6eaf227 100644
--- a/lib/micropub/webserver.rb
+++ b/lib/micropub/webserver.rb
@@ -55,7 +55,7 @@ module Micropub
     end
 
     def valid_token?
-      token = Indieauth::Token.new(endpoints.token_endpoint)
+      token = Indieauth::Token.new(endpoints[:token_endpoint])
 
       _, auth_token = request.env["HTTP_AUTHORIZATION"]&.split(" ")
       auth_token ||= params["access_token"]