Revert "Remove cache"

This reverts commit 448b52c11d097f37e5c8a1afdb3205f1f669b251.
Remove class