Switched to new extracted cache syntax.