In the middle of caching mark as unheard + other small changes