[PR] Update sunrise cache for better key management