Revert "ISSUE-63: New cache type"

This reverts commit 8191bcef16248219f8ec9eb49c3b05f8e951cf9b.