Review caching implementation

Problem/Motivation

Caching in this module should be reviewed and checked to ensure it works as expected.

Steps to reproduce

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes