try caching more stuff