Even more data cache tweaks - almost done
(need some polishing to make it shine)