Stash it all in cache for subsequent use. + Test

Please merge.