#10 Added cache clean-up code and switched Date over to Calendar.