latest attempt at caching
N.B. revert changes to storyboard ASAP