fixing caching regarding loading