Run storage cleanup when cleaning up CachingMiddleware
Some minor coding style fixes