Add caching of heartbeats