Add local parameter to allow configurable removal from cache after
loading
Move removeCache methods into implementation test