sync
Found slowness, missing id write to cache
merge slowness fix forward
Add id cache write change, left out in automatic merge (no conflict either)