Review caching implementation

Problem/Motivation

Caching in this module should be reviewed and checked to ensure it works as expected.
Especially if dynamic values like tokens can be used.

Steps to reproduce

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes