diff --git a/src/runtime/virtcontainers/factory/cache/cache.go b/src/runtime/virtcontainers/factory/cache/cache.go
index 599946251e..91a458bde6 100644
--- a/src/runtime/virtcontainers/factory/cache/cache.go
+++ b/src/runtime/virtcontainers/factory/cache/cache.go
@@ -19,12 +19,14 @@ import (
 type cache struct {
 	base base.FactoryBase
 
-	cacheCh   chan *vc.VM
-	closed    chan<- int
+	cacheCh chan *vc.VM
+	closed  chan<- int
+
+	vmm map[*vc.VM]interface{}
+
 	wg        sync.WaitGroup
 	closeOnce sync.Once
 
-	vmm     map[*vc.VM]interface{}
 	vmmLock sync.RWMutex
 }
 
diff --git a/src/runtime/virtcontainers/factory/factory.go b/src/runtime/virtcontainers/factory/factory.go
index cb339000bc..4c7e1e8603 100644
--- a/src/runtime/virtcontainers/factory/factory.go
+++ b/src/runtime/virtcontainers/factory/factory.go
@@ -32,13 +32,15 @@ var factoryLogger = logrus.FieldLogger(logrus.New())
 
 // Config is a collection of VM factory configurations.
 type Config struct {
-	Template        bool
-	VMCache         bool
-	Cache           uint
 	TemplatePath    string
 	VMCacheEndpoint string
 
 	VMConfig vc.VMConfig
+
+	Cache uint
+
+	Template bool
+	VMCache  bool
 }
 
 type factory struct {