Leveraging record cache
Fixes