diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index 030f2924b..fc27e4ffa 100644
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -3220,6 +3220,14 @@ sub set_cache {
   my ( $self, $data ) = @_;
   $self->throw_exception("set_cache requires an arrayref")
       if defined($data) && (ref $data ne 'ARRAY');
+
+  # If set_cache is called after a related resultset has been created,
+  # we expect subsequent calls to related_resultset to include cached
+  # results (if they are present on the objects in $data).
+  #
+  # This won't be true if we've cached the related_resultsets already,
+  # so clear them.
+  $self->{related_resultsets} = {};
   $self->{all_cache} = $data;
 }
 
diff --git a/t/resultset/cache.t b/t/resultset/cache.t
new file mode 100644
index 000000000..5c4bf979a
--- /dev/null
+++ b/t/resultset/cache.t
@@ -0,0 +1,56 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
+use strict;
+use warnings;
+
+use Test::More;
+use Test::Exception;
+
+use DBICTest;
+
+my $schema = DBICTest->init_schema();
+
+# Test how related_resultset and set_cache interact
+
+for my $i (0, 1) {
+
+  # We do this twice for comparison.
+  #
+  # The first time we will just set the cache and get the related resultset.
+  #
+  # The second time we will additionally get $cd_rset->related_resultset('artist') first.
+  #
+  # You would think this would have no effect on the second call.
+  #
+  # In 0.082840, however, this has the undesirable effect that even after set_cache is called,
+  # subsequent calls to $cd_rset->related_resultset('artist') reuse the previously generated resultset,
+  # instead of returning a resultset with the items from the cache.
+  #
+  # This would cause the final test to fail.
+
+  my @tracks = $schema->resultset('Track')->search({ title => 'Apiary' });
+
+  my $cd_rset = $tracks[0]->related_resultset('cd');
+
+  my @cds = $schema->resultset('CD')->search({ cdid => 1 }, { prefetch => 'artist' });
+
+  my ($artist_rset_before, $artist_rset_after);
+
+  if ($i) {
+    $artist_rset_before = $cd_rset->related_resultset('artist');
+  }
+
+  $cd_rset->set_cache(\@cds);
+
+  $artist_rset_after = $cd_rset->related_resultset('artist');
+
+  is scalar $cd_rset, 1, 'Track should belong to a CD';
+  is scalar @{ $cd_rset->get_cache || [] }, 1, 'CD cache should contain one item';
+
+  is scalar $cd_rset->related_resultset('artist'), 1, 'Track should belong to an Artist';
+
+  # The following fails when DBIx::Class::ResultSet::set_cache does not clear related resultsets
+  is scalar @{ $artist_rset_after->get_cache || [] }, 1, 'Artist cache should contain one item';
+}
+
+done_testing;