diff --git a/src/BirdsiteLive.Twitter/CachedTwitterService.cs b/src/BirdsiteLive.Twitter/CachedTwitterService.cs
index d9b90d2..ac20a62 100644
--- a/src/BirdsiteLive.Twitter/CachedTwitterService.cs
+++ b/src/BirdsiteLive.Twitter/CachedTwitterService.cs
@@ -24,7 +24,7 @@ namespace BirdsiteLive.Twitter
             // Keep in cache for this time, reset time if accessed.
             .SetSlidingExpiration(TimeSpan.FromHours(24))
             // Remove from cache after this time, regardless of sliding expiration
-            .SetAbsoluteExpiration(TimeSpan.FromDays(30));
+            .SetAbsoluteExpiration(TimeSpan.FromDays(7));
 
         #region Ctor
         public CachedTwitterUserService(ITwitterUserService twitterService)
diff --git a/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs b/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs
index 7fce30c..75ae645 100644
--- a/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs
+++ b/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs
@@ -57,7 +57,7 @@ namespace BirdsiteLive.Twitter.Extractors
             var message = tweet.FullText;
             var tweetUrls = tweet.Media.Select(x => x.URL).Distinct();
             
-            if (tweet.IsRetweet && tweet.QuotedStatusId == null && message.StartsWith("RT") && tweet.RetweetedTweet != null)
+            if (tweet.IsRetweet && message.StartsWith("RT") && tweet.RetweetedTweet != null)
             {
                 message = tweet.RetweetedTweet.FullText;
                 tweetUrls = tweet.RetweetedTweet.Media.Select(x => x.URL).Distinct();
diff --git a/src/BirdsiteLive/BirdsiteLive.csproj b/src/BirdsiteLive/BirdsiteLive.csproj
index 607a195..e23687f 100644
--- a/src/BirdsiteLive/BirdsiteLive.csproj
+++ b/src/BirdsiteLive/BirdsiteLive.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>d21486de-a812-47eb-a419-05682bb68856</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>0.13.0</Version>
+    <Version>0.13.1</Version>
   </PropertyGroup>
 
   <ItemGroup>