Added cache module as replacement