Do some cleanup and actually add calls to elasticache_update() now.