I would remove lines 277-230. As you said, `site_collection` is cached and computed on the first access... So, let's wait for the first access to initialize the cache.