Cleaning up caching

- Added/fixed documentation
- Changed naming
Revert "Cleaning up caching"

This reverts commit aef1d2b76cb6665cccb2937e62248e0cd49a0865.
Revert "Revert "Cleaning up caching""

This reverts commit 1005cd7752c6b5bc2ae0a5628d23a0bb1655a3b4.