Refactoring remove_from_cache to source file from header.