More tweeks to flotsam caching. Testing this for now.