Refactor of cache reaping-- now it works for both!