WP-840 Rolled back failed attempt at a fix -- caching is unreliable