Fix unavailability of default data due to caching