Fixes on embedded cache