1 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/messages/metadata.rb b/activesupport/lib/active_support/messages/metadata.rb
index e35086fb77..db14ac0b1c 100644
--- a/activesupport/lib/active_support/messages/metadata.rb
+++ b/activesupport/lib/active_support/messages/metadata.rb
@@ -5,13 +5,13 @@ module ActiveSupport
   module Messages #:nodoc:
     class Metadata #:nodoc:
       def initialize(expires_at, purpose)
-        @expires_at, @purpose = expires_at, purpose
+        @expires_at, @purpose = expires_at, purpose.to_s
       end
 
       class << self
         def wrap(message, expires_at: nil, expires_in: nil, purpose: nil)
           if expires_at || expires_in || purpose
-            { "value" => message, "_rails" => { "exp" => pick_expiry(expires_at, expires_in), "pur" => purpose.to_s } }
+            { "value" => message, "_rails" => { "exp" => pick_expiry(expires_at, expires_in), "pur" => purpose } }
           else
             message
           end
@@ -22,7 +22,7 @@ module ActiveSupport
 
           if metadata.nil?
             message if purpose.nil?
-          elsif metadata.match?(purpose.to_s) && metadata.fresh?
+          elsif metadata.match?(purpose) && metadata.fresh?
             message["value"]
           end
         end
@@ -32,7 +32,7 @@ module ActiveSupport
             if expires_at
               expires_at.utc.iso8601(3)
             elsif expires_in
-              expires_in.from_now.utc.iso8601(3)
+              Time.now.utc.advance(seconds: expires_in).iso8601(3)
             end
           end
 
@@ -44,7 +44,7 @@ module ActiveSupport
       end
 
       def match?(purpose)
-        @purpose == purpose
+        @purpose == purpose.to_s
       end
 
       def fresh?