Being more aggressive with caching.
This should help quell a warning.