Tidying up cache handeler