fixing spec
Merge branch '1310' into remove-cache