Fix update cache sweepers
Refactor cache hash sweeper
Simplify cached methods