Review caching implementation

Problem/Motivation

Caching in this module should be reviewed and checked to ensure it works as expected.
I guess it can be cached until someone changes the settings form?

Steps to reproduce

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes