[-] CORE : FixBug #PSCFV-11534 - Cache improvement