Finishing up last commit with closing clearing cache