Merge "bridges: Remove reliance on stasis caching"