As mentioned above, all of this cache caching _should_ be removed once a proper caching solution lands.