Completed refactoring of rename from cache4j to autocache4j