removing caching so that the heartbeat works