Squashed commit of the following:

commit 1ced3403cf7a775e4b822cb2be33d200a88eabd7
Author: klx <klx.klx@gmail.com>
Date:   Tue Jun 3 11:04:37 2014 -0600

    NS-462 reduced length of cache key