CYB-397 Remove some caching for Nico

* removal of some cruft, initial attempts to cache

https://jira.ets.berkeley.edu/jira/browse/CYB-397