Caching implemented, problems testing due to inability to call in system settings, state - should work