Dev work continues ...

Using directives exclusively. No jQuery.
Also removed the cache variable as it was clearly redundant.