Use options instead of transients [Finishes #84746428]