Cache layer added, statement cleanup