made loading faster and caching more reliable