[#63563642] Add caching and fix delay