First draft of caching optimization (#SUITE-1303)
Removing extraneous todo
Optimization of symbology (#SUITE-1303)
Leaving in only what works now (#SUITE-1303)