fixup
Add space in front of PRIxxx for consistency
Misc cache fixing up