Caching has been re-implemented in a more graceful way.