2 files changed, 7 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 19e76f6ed..0d1b396a9 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -508,12 +508,16 @@ has bodies => (
     default => sub {
         my $self = shift;
         return {} unless $self->bodies_str;
+        my $cache = $self->result_source->schema->cache;
+        return $cache->{bodies}{$self->bodies_str} if $cache->{bodies}{$self->bodies_str};
+
         my $bodies = $self->bodies_str_ids;
         my @bodies = $self->result_source->schema->resultset('Body')->search(
             { id => $bodies },
             { prefetch => 'body_areas' },
         )->all;
-        return { map { $_->id => $_ } @bodies };
+        $cache->{bodies}{$self->bodies_str} = { map { $_->id => $_ } @bodies };
+        return $cache->{bodies}{$self->bodies_str};
     },
 );
 
diff --git a/perllib/FixMyStreet/DB/Schema.pm b/perllib/FixMyStreet/DB/Schema.pm
index 45d731c33..10bbd434f 100644
--- a/perllib/FixMyStreet/DB/Schema.pm
+++ b/perllib/FixMyStreet/DB/Schema.pm
@@ -25,4 +25,6 @@ __PACKAGE__->connection(FixMyStreet->dbic_connect_info);
 
 has lang => ( is => 'rw' );
 
+has cache => ( is => 'rw', lazy => 1, default => sub { {} } );
+
 1;